[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>

3 files changed, 6 insertions, 6 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",