Commit 8b5690f8 authored by Yong Zhang's avatar Yong Zhang Committed by Ralf Baechle
Browse files

MIPS: 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.

[ralf@linux-mips.org: Fixed up conflicts in
arch/mips/alchemy/common/dbdma.c, arch/mips/cavium-octeon/smp.c and
arch/mips/kernel/perf_event.c.]

Signed-off-by: default avatarYong Zhang <yong.zhang0@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de
linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2835/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 43064c0c

arch/mips/alchemy/common/dbdma.c

+1 −2
Original line number Diff line number Diff line
@@ -1019,8 +1019,7 @@ static int __init dbdma_setup(unsigned int irq, dbdev_tab_t *idtable) 
	dbdma_gptr->ddma_inten = 0xffff;

	au_sync();



	ret = request_irq(irq, dbdma_interrupt, IRQF_DISABLED, "dbdma",

			  (void *)dbdma_gptr);

	ret = request_irq(irq, dbdma_interrupt, 0, "dbdma", (void *)dbdma_gptr);

	if (ret)

		printk(KERN_ERR "Cannot grab DBDMA interrupt!\n");

	else {

arch/mips/alchemy/common/time.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static struct clock_event_device au1x_rtcmatch2_clockdev = { 


static struct irqaction au1x_rtcmatch2_irqaction = {

	.handler	= au1x_rtcmatch2_irq,

	.flags		= IRQF_DISABLED | IRQF_TIMER,

	.flags		= IRQF_TIMER,

	.name		= "timer",

	.dev_id		= &au1x_rtcmatch2_clockdev,

};

arch/mips/alchemy/devboards/db1200/platform.c

+2 −2
Original line number Diff line number Diff line
@@ -276,12 +276,12 @@ static int db1200_mmc_cd_setup(void *mmc_host, int en) 


	if (en) {

		ret = request_irq(DB1200_SD0_INSERT_INT, db1200_mmc_cd,

				  IRQF_DISABLED, "sd_insert", mmc_host);

				  0, "sd_insert", mmc_host);

		if (ret)

			goto out;



		ret = request_irq(DB1200_SD0_EJECT_INT, db1200_mmc_cd,

				  IRQF_DISABLED, "sd_eject", mmc_host);

				  0, "sd_eject", mmc_host);

		if (ret) {

			free_irq(DB1200_SD0_INSERT_INT, mmc_host);

			goto out;

arch/mips/dec/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ static struct irqaction fpuirq = { 
};



static struct irqaction busirq = {

	.flags = IRQF_DISABLED,

	.name = "bus error",

	.flags = IRQF_NO_THREAD,

};

arch/mips/include/asm/mach-generic/floppy.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static inline void fd_disable_irq(void) 
static inline int fd_request_irq(void)

{

	return request_irq(FLOPPY_IRQ, floppy_interrupt,

	                   IRQF_DISABLED, "floppy", NULL);

	                   0, "floppy", NULL);

}



static inline void fd_free_irq(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE