]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
pcmcia: irq: Remove IRQF_DISABLED
authorYong Zhang <yong.zhang0@gmail.com>
Sat, 22 Oct 2011 09:56:49 +0000 (17:56 +0800)
committerDominik Brodowski <linux@dominikbrodowski.net>
Sat, 3 Mar 2012 13:43:36 +0000 (14:43 +0100)
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>
drivers/pcmcia/db1xxx_ss.c
drivers/pcmcia/soc_common.c

index 5b7c22784aff9713054b5b3f34d3ff9bed9ad91d..deb348cf573ee78c31d589e50dc17fdfaf737f5f 100644 (file)
@@ -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;
index a0a9c2aa8d78a5a02aae23065b6e2a51ccec7621..0493a3146da355ba57e0c384a90c485c0c9d1fa5 100644 (file)
@@ -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);