OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Yong Zhang 2011-10-22 17:56:49 +08:00 committed by Dominik Brodowski
parent 6b21d18ed5
commit d571c79e86
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pcmcia/db1xxx_ss.c
View File

@ -172,12 +172,12 @@ static int db1x_pcmcia_setup_irqs(struct db1x_pcmcia_sock *sock)
if ((sock->board_type == BOARD_TYPE_DB1200) || if ((sock->board_type == BOARD_TYPE_DB1200) ||
(sock->board_type == BOARD_TYPE_DB1300)) { (sock->board_type == BOARD_TYPE_DB1300)) {
ret = request_irq(sock->insert_irq, db1200_pcmcia_cdirq, ret = request_irq(sock->insert_irq, db1200_pcmcia_cdirq,
IRQF_DISABLED, "pcmcia_insert", sock); 0, "pcmcia_insert", sock);
if (ret) if (ret)
goto out1; goto out1;
ret = request_irq(sock->eject_irq, db1200_pcmcia_cdirq, ret = request_irq(sock->eject_irq, db1200_pcmcia_cdirq,
IRQF_DISABLED, "pcmcia_eject", sock); 0, "pcmcia_eject", sock);
if (ret) { if (ret) {
free_irq(sock->insert_irq, sock); free_irq(sock->insert_irq, sock);
goto out1; goto out1;

2
drivers/pcmcia/soc_common.c
View File

@ -535,7 +535,7 @@ int soc_pcmcia_request_irqs(struct soc_pcmcia_socket *skt,
if (irqs[i].sock != skt->nr) if (irqs[i].sock != skt->nr)
continue; continue;
res = request_irq(irqs[i].irq, soc_common_pcmcia_interrupt, res = request_irq(irqs[i].irq, soc_common_pcmcia_interrupt,
IRQF_DISABLED, irqs[i].str, skt); 0, irqs[i].str, skt);
if (res) if (res)
break; break;
irq_set_irq_type(irqs[i].irq, IRQ_TYPE_NONE); irq_set_irq_type(irqs[i].irq, IRQ_TYPE_NONE);