[PATCH] irq-flags: PPC: Use the new IRQF_ constants

Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

7 files changed, 8 insertions, 8 deletions

diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.c b/arch/ppc/platforms/85xx/mpc8560_ads.c
index 026ace320729..d90cd24d018e 100644
--- a/arch/ppc/platforms/85xx/mpc8560_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8560_ads.c
@@ -131,7 +131,7 @@ static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction cpm2_irqaction = {
         .handler = cpm2_cascade,
-        .flags = SA_INTERRUPT,
+        .flags = IRQF_DISABLED,
         .mask = CPU_MASK_NONE,
         .name = "cpm2_cascade",
 };
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index 139cf0d00855..75204588a3e7 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -136,7 +136,7 @@ static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction cpm2_irqaction = {
         .handler = cpm2_cascade,
-        .flags = SA_INTERRUPT,
+        .flags = IRQF_DISABLED,
         .mask = CPU_MASK_NONE,
         .name = "cpm2_cascade",
 };
diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/stx_gp3.c
index 224612412cbe..495aa79bb3a1 100644
--- a/arch/ppc/platforms/85xx/stx_gp3.c
+++ b/arch/ppc/platforms/85xx/stx_gp3.c
@@ -166,7 +166,7 @@ static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction cpm2_irqaction = {
         .handler        = cpm2_cascade,
-        .flags          = SA_INTERRUPT,
+        .flags          = IRQF_DISABLED,
         .mask           = CPU_MASK_NONE,
         .name           = "cpm2_cascade",
 };
diff --git a/arch/ppc/platforms/85xx/tqm85xx.c b/arch/ppc/platforms/85xx/tqm85xx.c
index 1c90f113cc8f..189ed4175f9f 100644
--- a/arch/ppc/platforms/85xx/tqm85xx.c
+++ b/arch/ppc/platforms/85xx/tqm85xx.c
@@ -190,7 +190,7 @@ static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction cpm2_irqaction = {
         .handler = cpm2_cascade,
-        .flags = SA_INTERRUPT,
+        .flags = IRQF_DISABLED,
         .mask = CPU_MASK_NONE,
         .name = "cpm2_cascade",
 };
diff --git a/arch/ppc/platforms/hdpu.c b/arch/ppc/platforms/hdpu.c
index 71af4b488621..e0f112a1fd0b 100644
--- a/arch/ppc/platforms/hdpu.c
+++ b/arch/ppc/platforms/hdpu.c
@@ -837,7 +837,7 @@ static void smp_hdpu_setup_cpu(int cpu_nr)
                 mv64x60_write(&bh, MV64360_CPU0_DOORBELL_CLR, 0xff);
                 mv64x60_write(&bh, MV64360_CPU0_DOORBELL_MASK, 0xff);
                 request_irq(60, hdpu_smp_cpu0_int_handler,
-                            SA_INTERRUPT, hdpu_smp0, 0);
+                            IRQF_DISABLED, hdpu_smp0, 0);
         }
 
         if (cpu_nr == 1) {
@@ -857,7 +857,7 @@ static void smp_hdpu_setup_cpu(int cpu_nr)
                 mv64x60_write(&bh, MV64360_CPU1_DOORBELL_CLR, 0x0);
                 mv64x60_write(&bh, MV64360_CPU1_DOORBELL_MASK, 0xff);
                 request_irq(28, hdpu_smp_cpu1_int_handler,
-                            SA_INTERRUPT, hdpu_smp1, 0);
+                            IRQF_DISABLED, hdpu_smp1, 0);
         }
 
 }
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c
index 97d6c21091e0..3bb530af0297 100644
--- a/arch/ppc/platforms/radstone_ppc7d.c
+++ b/arch/ppc/platforms/radstone_ppc7d.c
@@ -1310,7 +1310,7 @@ static void ppc7d_init2(void)
 
         /* Hook up i8259 interrupt which is connected to GPP28 */
         request_irq(mv64360_irq_base + MV64x60_IRQ_GPP28, ppc7d_i8259_intr,
-                    SA_INTERRUPT, "I8259 (GPP28) interrupt", (void *)0);
+                    IRQF_DISABLED, "I8259 (GPP28) interrupt", (void *)0);
 
         /* Configure MPP16 as watchdog NMI, MPP17 as watchdog WDE */
         spin_lock_irqsave(&mv64x60_lock, flags);
diff --git a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c
index 8cff1e303349..60b769c7f3fc 100644
--- a/arch/ppc/platforms/sbc82xx.c
+++ b/arch/ppc/platforms/sbc82xx.c
@@ -145,7 +145,7 @@ static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id, struct pt_regs *re
 
 static struct irqaction sbc82xx_i8259_irqaction = {
         .handler = sbc82xx_i8259_demux,
-        .flags = SA_INTERRUPT,
+        .flags = IRQF_DISABLED,
         .mask = CPU_MASK_NONE,
         .name = "i8259 demux",
 };