frv: remove deprecated IRQF_DISABLED

Remove the IRQF_DISABLED flag from FRV 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: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/frv/kernel/irq-mb93091.c b/arch/frv/kernel/irq-mb93091.c
index 2cc327a1ca44c51cbb455ddbf200532597c78131..091b2839be902dc488243394814d1a3c546a84b2 100644 (file)
--- a/arch/frv/kernel/irq-mb93091.c
+++ b/arch/frv/kernel/irq-mb93091.c
@@ -107,25 +107,25 @@ static irqreturn_t fpga_interrupt(int irq, void *_mask)
 static struct irqaction fpga_irq[4]  = {
        [0] = {
                .handler        = fpga_interrupt,
-               .flags          = IRQF_DISABLED | IRQF_SHARED,
+               .flags          = IRQF_SHARED,
                .name           = "fpga.0",
                .dev_id         = (void *) 0x0028UL,
        },
        [1] = {
                .handler        = fpga_interrupt,
-               .flags          = IRQF_DISABLED | IRQF_SHARED,
+               .flags          = IRQF_SHARED,
                .name           = "fpga.1",
                .dev_id         = (void *) 0x0050UL,
        },
        [2] = {
                .handler        = fpga_interrupt,
-               .flags          = IRQF_DISABLED | IRQF_SHARED,
+               .flags          = IRQF_SHARED,
                .name           = "fpga.2",
                .dev_id         = (void *) 0x1c00UL,
        },
        [3] = {
                .handler        = fpga_interrupt,
-               .flags          = IRQF_DISABLED | IRQF_SHARED,
+               .flags          = IRQF_SHARED,
                .name           = "fpga.3",
                .dev_id         = (void *) 0x6386UL,
        }

diff --git a/arch/frv/kernel/irq-mb93093.c b/arch/frv/kernel/irq-mb93093.c
index 95e4eb4f1f383adb5c5bf552552d64fb7175ad33..1f3015cf80f549c77df7e165527a30478d0eb0f4 100644 (file)
--- a/arch/frv/kernel/irq-mb93093.c
+++ b/arch/frv/kernel/irq-mb93093.c
@@ -105,7 +105,6 @@ static irqreturn_t fpga_interrupt(int irq, void *_mask)
 static struct irqaction fpga_irq[1]  = {
        [0] = {
                .handler        = fpga_interrupt,
-               .flags          = IRQF_DISABLED,
                .name           = "fpga.0",
                .dev_id         = (void *) 0x0700UL,
        }

diff --git a/arch/frv/kernel/irq-mb93493.c b/arch/frv/kernel/irq-mb93493.c
index ba648da0932daec3fc71da4feec67ac660a31e12..8ca5aa4ff5958346013f0fa42d0189f2f7d268ab 100644 (file)
--- a/arch/frv/kernel/irq-mb93493.c
+++ b/arch/frv/kernel/irq-mb93493.c
@@ -118,13 +118,13 @@ static irqreturn_t mb93493_interrupt(int irq, void *_piqsr)
 static struct irqaction mb93493_irq[2]  = {
        [0] = {
                .handler        = mb93493_interrupt,
-               .flags          = IRQF_DISABLED | IRQF_SHARED,
+               .flags          = IRQF_SHARED,
                .name           = "mb93493.0",
                .dev_id         = (void *) __addr_MB93493_IQSR(0),
        },
        [1] = {
                .handler        = mb93493_interrupt,
-               .flags          = IRQF_DISABLED | IRQF_SHARED,
+               .flags          = IRQF_SHARED,
                .name           = "mb93493.1",
                .dev_id         = (void *) __addr_MB93493_IQSR(1),
        }

diff --git a/arch/frv/kernel/time.c b/arch/frv/kernel/time.c
index b457de496b7052272e54857b6687f15d190365ad..332e00bf9d0688b14f29ff5393728e02bdb779d3 100644 (file)
--- a/arch/frv/kernel/time.c
+++ b/arch/frv/kernel/time.c
@@ -44,7 +44,6 @@ static irqreturn_t timer_interrupt(int irq, void *dummy);
 
 static struct irqaction timer_irq  = {
        .handler = timer_interrupt,
-       .flags = IRQF_DISABLED,
        .name = "timer",
 };