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>

diff --git a/arch/mn10300/kernel/cevt-mn10300.c b/arch/mn10300/kernel/cevt-mn10300.c
index ccce35e3e179150c87f5f94af2a2463333236a68..60f64ca1752aff964ee6274ed066ccf9744d5034 100644 (file)
--- a/arch/mn10300/kernel/cevt-mn10300.c
+++ b/arch/mn10300/kernel/cevt-mn10300.c
@@ -113,7 +113,7 @@ int __init init_clockevents(void)
        cd->set_next_event      = next_event;
 
        iact = &per_cpu(timer_irq, cpu);
-       iact->flags = IRQF_DISABLED | IRQF_SHARED | IRQF_TIMER;
+       iact->flags = IRQF_SHARED | IRQF_TIMER;
        iact->handler = timer_interrupt;
 
        clockevents_register_device(cd);

diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c
index bf6e949a2f87a63f701f3a23a468574da4561cfe..7ecf69879e2d6ff077296a79605d8f367b70fdd4 100644 (file)
--- 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)
        irq_set_chip(port->tm_irq, &mn10300_serial_pic);
 
        if (request_irq(port->rx_irq, mn10300_serial_interrupt,
-                       IRQF_DISABLED | IRQF_NOBALANCING,
+                       IRQF_NOBALANCING,
                        port->rx_name, port) < 0)
                goto error;
 
        if (request_irq(port->tx_irq, mn10300_serial_interrupt,
-                       IRQF_DISABLED | IRQF_NOBALANCING,
+                       IRQF_NOBALANCING,
                        port->tx_name, port) < 0)
                goto error2;
 
        if (request_irq(port->tm_irq, mn10300_serial_interrupt,
-                       IRQF_DISABLED | IRQF_NOBALANCING,
+                       IRQF_NOBALANCING,
                        port->tm_name, port) < 0)
                goto error3;
        mn10300_serial_mask_ack(port->tm_irq);

diff --git a/arch/mn10300/kernel/smp.c b/arch/mn10300/kernel/smp.c
index a17f9c9c14c9f3b7115d41f4ad765ee70de3ba2a..f984193718b1003f03861e79cd137b4a8c23badd 100644 (file)
--- a/arch/mn10300/kernel/smp.c
+++ b/arch/mn10300/kernel/smp.c
@@ -143,7 +143,7 @@ static struct irqaction call_function_ipi = {
 static irqreturn_t smp_ipi_timer_interrupt(int irq, void *dev_id);
 static struct irqaction local_timer_ipi = {
        .handler        = smp_ipi_timer_interrupt,
-       .flags          = IRQF_DISABLED | IRQF_NOBALANCING,
+       .flags          = IRQF_NOBALANCING,
        .name           = "smp local timer IPI"
 };
 #endif

diff --git a/arch/mn10300/unit-asb2364/irq-fpga.c b/arch/mn10300/unit-asb2364/irq-fpga.c
index e16c216f31dcdd3ce0c4279f6e921ce13db1f41e..073e2ccc4a441b419bc58c2207eba4f5e7eae81c 100644 (file)
--- 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)
 static struct irqaction fpga_irq[]  = {
        [0] = {
                .handler        = fpga_interrupt,
-               .flags          = IRQF_DISABLED | IRQF_SHARED,
+               .flags          = IRQF_SHARED,
                .name           = "fpga",
        },
 };