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

Commit d2f09b1c authored by Michael Opdenacker's avatar Michael Opdenacker Committed by David S. Miller
Browse files

sparc: remove deprecated IRQF_DISABLED 



This patch proposes to remove the IRQF_DISABLED flag from sparc architecture
code. It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: default avatarMichael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 26794942

arch/sparc/include/asm/floppy_64.h

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static int sun_fd_request_irq(void) 
		once = 1;



		error = request_irq(FLOPPY_IRQ, sparc_floppy_irq,

				    IRQF_DISABLED, "floppy", NULL);

				    0, "floppy", NULL);



		return ((error == 0) ? 0 : -1);

	}

arch/sparc/kernel/ldc.c

+2 −2
Original line number Diff line number Diff line
@@ -1249,12 +1249,12 @@ int ldc_bind(struct ldc_channel *lp, const char *name) 
	snprintf(lp->rx_irq_name, LDC_IRQ_NAME_MAX, "%s RX", name);

	snprintf(lp->tx_irq_name, LDC_IRQ_NAME_MAX, "%s TX", name);



	err = request_irq(lp->cfg.rx_irq, ldc_rx, IRQF_DISABLED,

	err = request_irq(lp->cfg.rx_irq, ldc_rx, 0,

			  lp->rx_irq_name, lp);

	if (err)

		return err;



	err = request_irq(lp->cfg.tx_irq, ldc_tx, IRQF_DISABLED,

	err = request_irq(lp->cfg.tx_irq, ldc_tx, 0,

			  lp->tx_irq_name, lp);

	if (err) {

		free_irq(lp->cfg.rx_irq, lp);