[PATCH] irq-flags: MIPS: 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>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

23 files changed, 38 insertions, 49 deletions

diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c
index 69cabb7463ff..98244d51c154 100644
--- a/arch/mips/au1000/common/dbdma.c
+++ b/arch/mips/au1000/common/dbdma.c
@@ -892,7 +892,7 @@ static void au1xxx_dbdma_init(void)
         #error Unknown Au1x00 SOC
 #endif
 
-        if (request_irq(irq_nr, dbdma_interrupt, SA_INTERRUPT,
+        if (request_irq(irq_nr, dbdma_interrupt, IRQF_DISABLED,
                         "Au1xxx dbdma", (void *)dbdma_gptr))
                 printk("Can't get 1550 dbdma irq");
 }
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c
index c0d56c130a59..29d6f8178bad 100644
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
@@ -309,7 +309,7 @@ void startup_match20_interrupt(irqreturn_t (*handler)(int, void *, struct pt_reg
          * can avoid it.  --cgray
         */
         action.dev_id = handler;
-        action.flags = SA_INTERRUPT;
+        action.flags = IRQF_DISABLED;
         cpus_clear(action.mask);
         action.name = "Au1xxx TOY";
         action.handler = handler;
diff --git a/arch/mips/au1000/common/usbdev.c b/arch/mips/au1000/common/usbdev.c
index 2cab7629702c..63bcb3a95dc7 100644
--- a/arch/mips/au1000/common/usbdev.c
+++ b/arch/mips/au1000/common/usbdev.c
@@ -1465,14 +1465,14 @@ usbdev_init(struct usb_device_descriptor* dev_desc,
          */
 
         /* request the USB device transfer complete interrupt */
-        if (request_irq(AU1000_USB_DEV_REQ_INT, req_sus_intr, SA_INTERRUPT,
+        if (request_irq(AU1000_USB_DEV_REQ_INT, req_sus_intr, IRQF_DISABLED,
                         "USBdev req", &usbdev)) {
                 err("Can't get device request intr");
                 ret = -ENXIO;
                 goto out;
         }
         /* request the USB device suspend interrupt */
-        if (request_irq(AU1000_USB_DEV_SUS_INT, req_sus_intr, SA_INTERRUPT,
+        if (request_irq(AU1000_USB_DEV_SUS_INT, req_sus_intr, IRQF_DISABLED,
                         "USBdev sus", &usbdev)) {
                 err("Can't get device suspend intr");
                 ret = -ENXIO;
@@ -1483,7 +1483,7 @@ usbdev_init(struct usb_device_descriptor* dev_desc,
         if ((ep0->indma = request_au1000_dma(ep_dma_id[0].id,
                                              ep_dma_id[0].str,
                                              dma_done_ep0_intr,
-                                             SA_INTERRUPT,
+                                             IRQF_DISABLED,
                                              &usbdev)) < 0) {
                 err("Can't get %s DMA", ep_dma_id[0].str);
                 ret = -ENXIO;
@@ -1516,7 +1516,7 @@ usbdev_init(struct usb_device_descriptor* dev_desc,
                                 request_au1000_dma(ep_dma_id[ep->address].id,
                                                    ep_dma_id[ep->address].str,
                                                    dma_done_ep_intr,
-                                                   SA_INTERRUPT,
+                                                   IRQF_DISABLED,
                                                    &usbdev);
                         if (ep->indma < 0) {
                                 err("Can't get %s DMA",
diff --git a/arch/mips/basler/excite/excite_iodev.c b/arch/mips/basler/excite/excite_iodev.c
index 91121e523043..b288151b532e 100644
--- a/arch/mips/basler/excite/excite_iodev.c
+++ b/arch/mips/basler/excite/excite_iodev.c
@@ -113,7 +113,7 @@ static int __exit iodev_remove(struct device *dev)
 
 static int iodev_open(struct inode *i, struct file *f)
 {
-        return request_irq(iodev_irq, iodev_irqhdl, SA_INTERRUPT,
+        return request_irq(iodev_irq, iodev_irqhdl, IRQF_DISABLED,
                            iodev_name, &miscdev);
 }
 
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c
index 9c707b9ceb65..2684f121784b 100644
--- a/arch/mips/dec/setup.c
+++ b/arch/mips/dec/setup.c
@@ -105,7 +105,7 @@ static struct irqaction fpuirq = {
 };
 
 static struct irqaction busirq = {
-        .flags = SA_INTERRUPT,
+        .flags = IRQF_DISABLED,
         .name = "bus error",
 };
 
@@ -124,7 +124,7 @@ static void __init dec_be_init(void)
         case MACH_DS23100:      /* DS2100/DS3100 Pmin/Pmax */
                 board_be_handler = dec_kn01_be_handler;
                 busirq.handler = dec_kn01_be_interrupt;
-                busirq.flags |= SA_SHIRQ;
+                busirq.flags |= IRQF_SHARED;
                 dec_kn01_be_init();
                 break;
         case MACH_DS5000_1XX:   /* DS5000/1xx 3min */
diff --git a/arch/mips/gt64120/common/time.c b/arch/mips/gt64120/common/time.c
index c64a7723cafb..d837b26fbe51 100644
--- a/arch/mips/gt64120/common/time.c
+++ b/arch/mips/gt64120/common/time.c
@@ -77,7 +77,7 @@ void gt64120_time_init(void)
          * the values to the correct interrupt line.
          */
         timer.handler = gt64120_irq;
-        timer.flags = SA_SHIRQ | SA_INTERRUPT;
+        timer.flags = IRQF_SHARED | IRQF_DISABLED;
         timer.name = "timer";
         timer.dev_id = NULL;
         timer.next = NULL;
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index caf777f83289..cdab1b2cd134 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -487,7 +487,7 @@ static struct file_operations rtlx_fops = {
 
 static struct irqaction rtlx_irq = {
         .handler        = rtlx_interrupt,
-        .flags          = SA_INTERRUPT,
+        .flags          = IRQF_DISABLED,
         .name           = "RTLX",
 };
 
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index 57770902b9ae..93429a4d3012 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -130,13 +130,13 @@ irqreturn_t ipi_call_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction irq_resched = {
         .handler        = ipi_resched_interrupt,