diff options
| author | Yong Zhang <yong.zhang0@gmail.com> | 2011-10-22 17:56:49 +0800 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2012-03-03 14:43:36 +0100 |
| commit | d571c79e86fa7704265b9127403a78ccd3c01729 (patch) | |
| tree | f60767922ab009ff94fa295e98d1c25502a8ece8 /drivers/pcmcia | |
| parent | 6b21d18ed50c7d145220b0724ea7f2613abf0f95 (diff) | |
| download | linux-3.10-d571c79e86fa7704265b9127403a78ccd3c01729.tar.gz linux-3.10-d571c79e86fa7704265b9127403a78ccd3c01729.tar.bz2 linux-3.10-d571c79e86fa7704265b9127403a78ccd3c01729.zip | |
pcmcia: irq: Remove IRQF_DISABLED
Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).
So now this flag is a NOOP and can be removed.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/db1xxx_ss.c | 4 | ||||
| -rw-r--r-- | drivers/pcmcia/soc_common.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c index 5b7c22784af..deb348cf573 100644 --- a/drivers/pcmcia/db1xxx_ss.c +++ b/drivers/pcmcia/db1xxx_ss.c @@ -172,12 +172,12 @@ static int db1x_pcmcia_setup_irqs(struct db1x_pcmcia_sock *sock) if ((sock->board_type == BOARD_TYPE_DB1200) || (sock->board_type == BOARD_TYPE_DB1300)) { ret = request_irq(sock->insert_irq, db1200_pcmcia_cdirq, - IRQF_DISABLED, "pcmcia_insert", sock); + 0, "pcmcia_insert", sock); if (ret) goto out1; ret = request_irq(sock->eject_irq, db1200_pcmcia_cdirq, - IRQF_DISABLED, "pcmcia_eject", sock); + 0, "pcmcia_eject", sock); if (ret) { free_irq(sock->insert_irq, sock); goto out1; diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index a0a9c2aa8d7..0493a3146da 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -535,7 +535,7 @@ int soc_pcmcia_request_irqs(struct soc_pcmcia_socket *skt, if (irqs[i].sock != skt->nr) continue; res = request_irq(irqs[i].irq, soc_common_pcmcia_interrupt, - IRQF_DISABLED, irqs[i].str, skt); + 0, irqs[i].str, skt); if (res) break; irq_set_irq_type(irqs[i].irq, IRQ_TYPE_NONE); |