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

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
...@@ -85,7 +85,7 @@ static int fd_request_irq(void) ...@@ -85,7 +85,7 @@ static int fd_request_irq(void)
{ {
if(MACH_IS_Q40) if(MACH_IS_Q40)
return request_irq(FLOPPY_IRQ, floppy_hardint, return request_irq(FLOPPY_IRQ, floppy_hardint,
IRQF_DISABLED, "floppy", floppy_hardint); 0, "floppy", floppy_hardint);
else if(MACH_IS_SUN3X) else if(MACH_IS_SUN3X)
return sun3xflop_request_irq(); return sun3xflop_request_irq();
return -ENXIO; return -ENXIO;
......
...@@ -207,7 +207,7 @@ static int sun3xflop_request_irq(void) ...@@ -207,7 +207,7 @@ static int sun3xflop_request_irq(void)
if(!once) { if(!once) {
once = 1; once = 1;
error = request_irq(FLOPPY_IRQ, sun3xflop_hardint, error = request_irq(FLOPPY_IRQ, sun3xflop_hardint,
IRQF_DISABLED, "floppy", NULL); 0, "floppy", NULL);
return ((error == 0) ? 0 : -1); return ((error == 0) ? 0 : -1);
} else return 0; } else return 0;
} }
......
...@@ -70,7 +70,7 @@ static irqreturn_t hw_tick(int irq, void *dummy) ...@@ -70,7 +70,7 @@ static irqreturn_t hw_tick(int irq, void *dummy)
static struct irqaction m68328_timer_irq = { static struct irqaction m68328_timer_irq = {
.name = "timer", .name = "timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = hw_tick, .handler = hw_tick,
}; };
......
...@@ -58,7 +58,7 @@ static irqreturn_t hw_tick(int irq, void *dummy) ...@@ -58,7 +58,7 @@ static irqreturn_t hw_tick(int irq, void *dummy)
static struct irqaction m68360_timer_irq = { static struct irqaction m68360_timer_irq = {
.name = "timer", .name = "timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = hw_tick, .handler = hw_tick,
}; };
......
...@@ -118,7 +118,7 @@ static irqreturn_t pit_tick(int irq, void *dummy) ...@@ -118,7 +118,7 @@ static irqreturn_t pit_tick(int irq, void *dummy)
static struct irqaction pit_irq = { static struct irqaction pit_irq = {
.name = "timer", .name = "timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = pit_tick, .handler = pit_tick,
}; };
......
...@@ -51,7 +51,7 @@ irqreturn_t mcfslt_profile_tick(int irq, void *dummy) ...@@ -51,7 +51,7 @@ irqreturn_t mcfslt_profile_tick(int irq, void *dummy)
static struct irqaction mcfslt_profile_irq = { static struct irqaction mcfslt_profile_irq = {
.name = "profile timer", .name = "profile timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = mcfslt_profile_tick, .handler = mcfslt_profile_tick,
}; };
...@@ -93,7 +93,7 @@ static irqreturn_t mcfslt_tick(int irq, void *dummy) ...@@ -93,7 +93,7 @@ static irqreturn_t mcfslt_tick(int irq, void *dummy)
static struct irqaction mcfslt_timer_irq = { static struct irqaction mcfslt_timer_irq = {
.name = "timer", .name = "timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = mcfslt_tick, .handler = mcfslt_tick,
}; };
......
...@@ -83,7 +83,7 @@ static irqreturn_t mcftmr_tick(int irq, void *dummy) ...@@ -83,7 +83,7 @@ static irqreturn_t mcftmr_tick(int irq, void *dummy)
static struct irqaction mcftmr_timer_irq = { static struct irqaction mcftmr_timer_irq = {
.name = "timer", .name = "timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = mcftmr_tick, .handler = mcftmr_tick,
}; };
...@@ -171,7 +171,7 @@ irqreturn_t coldfire_profile_tick(int irq, void *dummy) ...@@ -171,7 +171,7 @@ irqreturn_t coldfire_profile_tick(int irq, void *dummy)
static struct irqaction coldfire_profile_irq = { static struct irqaction coldfire_profile_irq = {
.name = "profile timer", .name = "profile timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = coldfire_profile_tick, .handler = coldfire_profile_tick,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment