diff options
author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2014-03-04 15:31:51 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-03-04 15:47:51 -0500 |
commit | 322a126a8fa8af80d9dc06e7168db11d1aabdba7 (patch) | |
tree | 91d4fe136fc8f28e388493c98261481d1f1d7d5f | |
parent | 2958a489d7d31552fd1a0a8f54a5005c278d4606 (diff) |
mn10300: Remove deprecated IRQF_DISABLED
This patch removes the IRQF_DISABLED flag from mn10300 architecture
code. It's a NOOP since 2.6.35 and it will be removed one day.
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Cc: srivatsa.bhat@linux.vnet.ibm.com
Cc: linux-am33-list@redhat.com
Cc: dhowells@redhat.com
Cc: yasutake.koichi@jp.panasonic.com
Link: http://lkml.kernel.org/r/1393965111-17092-1-git-send-email-michael.opdenacker@free-electrons.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/mn10300/kernel/cevt-mn10300.c | 2 | ||||
-rw-r--r-- | arch/mn10300/kernel/mn10300-serial.c | 6 | ||||
-rw-r--r-- | arch/mn10300/kernel/smp.c | 2 | ||||
-rw-r--r-- | arch/mn10300/unit-asb2364/irq-fpga.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/mn10300/kernel/cevt-mn10300.c b/arch/mn10300/kernel/cevt-mn10300.c index ccce35e3e179..60f64ca1752a 100644 --- a/arch/mn10300/kernel/cevt-mn10300.c +++ b/arch/mn10300/kernel/cevt-mn10300.c | |||
@@ -113,7 +113,7 @@ int __init init_clockevents(void) | |||
113 | cd->set_next_event = next_event; | 113 | cd->set_next_event = next_event; |
114 | 114 | ||
115 | iact = &per_cpu(timer_irq, cpu); | 115 | iact = &per_cpu(timer_irq, cpu); |
116 | iact->flags = IRQF_DISABLED | IRQF_SHARED | IRQF_TIMER; | 116 | iact->flags = IRQF_SHARED | IRQF_TIMER; |
117 | iact->handler = timer_interrupt; | 117 | iact->handler = timer_interrupt; |
118 | 118 | ||
119 | clockevents_register_device(cd); | 119 | clockevents_register_device(cd); |
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c index bf6e949a2f87..7ecf69879e2d 100644 --- a/arch/mn10300/kernel/mn10300-serial.c +++ b/arch/mn10300/kernel/mn10300-serial.c | |||
@@ -985,17 +985,17 @@ static int mn10300_serial_startup(struct uart_port *_port) | |||
985 | irq_set_chip(port->tm_irq, &mn10300_serial_pic); | 985 | irq_set_chip(port->tm_irq, &mn10300_serial_pic); |
986 | 986 | ||
987 | if (request_irq(port->rx_irq, mn10300_serial_interrupt, | 987 | if (request_irq(port->rx_irq, mn10300_serial_interrupt, |
988 | IRQF_DISABLED | IRQF_NOBALANCING, | 988 | IRQF_NOBALANCING, |
989 | port->rx_name, port) < 0) | 989 | port->rx_name, port) < 0) |
990 | goto error; | 990 | goto error; |
991 | 991 | ||
992 | if (request_irq(port->tx_irq, mn10300_serial_interrupt, | 992 | if (request_irq(port->tx_irq, mn10300_serial_interrupt, |
993 | IRQF_DISABLED | IRQF_NOBALANCING, | 993 | IRQF_NOBALANCING, |
994 | port->tx_name, port) < 0) | 994 | port->tx_name, port) < 0) |
995 | goto error2; | 995 | goto error2; |
996 | 996 | ||
997 | if (request_irq(port->tm_irq, mn10300_serial_interrupt, | 997 | if (request_irq(port->tm_irq, mn10300_serial_interrupt, |
998 | IRQF_DISABLED | IRQF_NOBALANCING, | 998 | IRQF_NOBALANCING, |
999 | port->tm_name, port) < 0) | 999 | port->tm_name, port) < 0) |
1000 | goto error3; | 1000 | goto error3; |
1001 | mn10300_serial_mask_ack(port->tm_irq); | 1001 | mn10300_serial_mask_ack(port->tm_irq); |
diff --git a/arch/mn10300/kernel/smp.c b/arch/mn10300/kernel/smp.c index a17f9c9c14c9..f984193718b1 100644 --- a/arch/mn10300/kernel/smp.c +++ b/arch/mn10300/kernel/smp.c | |||
@@ -143,7 +143,7 @@ static struct irqaction call_function_ipi = { | |||
143 | static irqreturn_t smp_ipi_timer_interrupt(int irq, void *dev_id); | 143 | static irqreturn_t smp_ipi_timer_interrupt(int irq, void *dev_id); |
144 | static struct irqaction local_timer_ipi = { | 144 | static struct irqaction local_timer_ipi = { |
145 | .handler = smp_ipi_timer_interrupt, | 145 | .handler = smp_ipi_timer_interrupt, |
146 | .flags = IRQF_DISABLED | IRQF_NOBALANCING, | 146 | .flags = IRQF_NOBALANCING, |
147 | .name = "smp local timer IPI" | 147 | .name = "smp local timer IPI" |
148 | }; | 148 | }; |
149 | #endif | 149 | #endif |
diff --git a/arch/mn10300/unit-asb2364/irq-fpga.c b/arch/mn10300/unit-asb2364/irq-fpga.c index e16c216f31dc..073e2ccc4a44 100644 --- a/arch/mn10300/unit-asb2364/irq-fpga.c +++ b/arch/mn10300/unit-asb2364/irq-fpga.c | |||
@@ -76,7 +76,7 @@ static irqreturn_t fpga_interrupt(int irq, void *_mask) | |||
76 | static struct irqaction fpga_irq[] = { | 76 | static struct irqaction fpga_irq[] = { |
77 | [0] = { | 77 | [0] = { |
78 | .handler = fpga_interrupt, | 78 | .handler = fpga_interrupt, |
79 | .flags = IRQF_DISABLED | IRQF_SHARED, | 79 | .flags = IRQF_SHARED, |
80 | .name = "fpga", | 80 | .name = "fpga", |
81 | }, | 81 | }, |
82 | }; | 82 | }; |