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

Commit 77a42796 authored by Michael Opdenacker's avatar Michael Opdenacker Committed by Geert Uytterhoeven
Browse files

m68k: Remove deprecated IRQF_DISABLED 



This patch proposes to remove the IRQF_DISABLED flag from m68k 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 avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 21e884ba

arch/m68k/include/asm/floppy.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int fd_request_irq(void) 
{

	if(MACH_IS_Q40)

		return request_irq(FLOPPY_IRQ, floppy_hardint,

				   IRQF_DISABLED, "floppy", floppy_hardint);

				   0, "floppy", floppy_hardint);

	else if(MACH_IS_SUN3X)

		return sun3xflop_request_irq();

	return -ENXIO;

arch/m68k/include/asm/sun3xflop.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static int sun3xflop_request_irq(void) 
	if(!once) {

		once = 1;

		error = request_irq(FLOPPY_IRQ, sun3xflop_hardint,

				    IRQF_DISABLED, "floppy", NULL);

				    0, "floppy", NULL);

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

	} else return 0;

}

arch/m68k/platform/68000/timers.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static irqreturn_t hw_tick(int irq, void *dummy) 


static struct irqaction m68328_timer_irq = {

	.name	 = "timer",

	.flags	 = IRQF_DISABLED | IRQF_TIMER,

	.flags	 = IRQF_TIMER,

	.handler = hw_tick,

};

arch/m68k/platform/68360/config.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static irqreturn_t hw_tick(int irq, void *dummy) 


static struct irqaction m68360_timer_irq = {

	.name	 = "timer",

	.flags	 = IRQF_DISABLED | IRQF_TIMER,

	.flags	 = IRQF_TIMER,

	.handler = hw_tick,

};

arch/m68k/platform/coldfire/pit.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static irqreturn_t pit_tick(int irq, void *dummy) 


static struct irqaction pit_irq = {

	.name	 = "timer",

	.flags	 = IRQF_DISABLED | IRQF_TIMER,

	.flags	 = IRQF_TIMER,

	.handler = pit_tick,

};