Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d571c79e authored by Yong Zhang's avatar Yong Zhang Committed by Dominik Brodowski
Browse files

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: default avatarYong Zhang <yong.zhang0@gmail.com>
Acked-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 6b21d18e

drivers/pcmcia/db1xxx_ss.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/pcmcia/soc_common.c

+1 −1
Original line number Diff line number Diff line
@@ -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);