7 files changed, 10 insertions, 11 deletions

diff --git a/arch/sh/drivers/dma/dma-g2.c b/arch/sh/drivers/dma/dma-g2.c
index af7bb589c2c8..be9ca7ca0ce4 100644
--- a/arch/sh/drivers/dma/dma-g2.c
+++ b/arch/sh/drivers/dma/dma-g2.c
@@ -170,7 +170,7 @@ static int __init g2_dma_init(void)
 {
         int ret;
 
-        ret = request_irq(HW_EVENT_G2_DMA, g2_dma_interrupt, IRQF_DISABLED,
+        ret = request_irq(HW_EVENT_G2_DMA, g2_dma_interrupt, 0,
                           "g2 DMA handler", &g2_dma_info);
         if (unlikely(ret))
                 return -EINVAL;
diff --git a/arch/sh/drivers/dma/dma-pvr2.c b/arch/sh/drivers/dma/dma-pvr2.c
index 3cee58e7f1e5..706a3434af7a 100644
--- a/arch/sh/drivers/dma/dma-pvr2.c
+++ b/arch/sh/drivers/dma/dma-pvr2.c
@@ -70,7 +70,6 @@ static int pvr2_xfer_dma(struct dma_channel *chan)
 static struct irqaction pvr2_dma_irq = {
         .name           = "pvr2 DMA handler",
         .handler        = pvr2_dma_interrupt,
-        .flags          = IRQF_DISABLED,
 };
 
 static struct dma_ops pvr2_dma_ops = {
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
index 827208781ed5..a60da6dd4d17 100644
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -95,7 +95,7 @@ static int sh_dmac_request_dma(struct dma_channel *chan)
 #if defined(CONFIG_SH_DMA_IRQ_MULTI)
                                 IRQF_SHARED,
 #else
-                                IRQF_DISABLED,
+                                0,
 #endif
                                 chan->dev_id, chan);
 }
@@ -305,7 +305,7 @@ static int __init sh_dmac_init(void)
 #if defined(CONFIG_SH_DMA_IRQ_MULTI)
                                 IRQF_SHARED,
 #else
-                                IRQF_DISABLED,
+                                0,
 #endif
                                 dmae_name[n], (void *)dmae_name[n]);
                 if (unlikely(i < 0)) {
diff --git a/arch/sh/drivers/dma/dmabrg.c b/arch/sh/drivers/dma/dmabrg.c
index 6ab9c4a15439..3d66a32ce610 100644
--- a/arch/sh/drivers/dma/dmabrg.c
+++ b/arch/sh/drivers/dma/dmabrg.c
@@ -174,17 +174,17 @@ static int __init dmabrg_init(void)
         or = __raw_readl(DMAOR);
         __raw_writel(or | DMAOR_BRG | DMAOR_DMEN, DMAOR);
 
-        ret = request_irq(DMABRGI0, dmabrg_irq, IRQF_DISABLED,
+        ret = request_irq(DMABRGI0, dmabrg_irq, 0,
                         "DMABRG USB address error", NULL);
         if (ret)
                 goto out0;
 
-        ret = request_irq(DMABRGI1, dmabrg_irq, IRQF_DISABLED,
+        ret = request_irq(DMABRGI1, dmabrg_irq, 0,
                         "DMABRG Transfer End", NULL);
         if (ret)
                 goto out1;
 
-        ret = request_irq(DMABRGI2, dmabrg_irq, IRQF_DISABLED,
+        ret = request_irq(DMABRGI2, dmabrg_irq, 0,
                         "DMABRG Transfer Half", NULL);
         if (ret == 0)
                 return ret;
diff --git a/arch/sh/drivers/pci/pci-sh5.c b/arch/sh/drivers/pci/pci-sh5.c
index 0bf296c78795..16c1e721bf54 100644
--- a/arch/sh/drivers/pci/pci-sh5.c
+++ b/arch/sh/drivers/pci/pci-sh5.c
@@ -107,13 +107,13 @@ static int __init sh5pci_init(void)
         u32 uval;
 
         if (request_irq(IRQ_ERR, pcish5_err_irq,
-                        IRQF_DISABLED, "PCI Error",NULL) < 0) {
+                        0, "PCI Error",NULL) < 0) {
                 printk(KERN_ERR "PCISH5: Cannot hook PCI_PERR interrupt\n");
                 return -EINVAL;
         }
 
         if (request_irq(IRQ_SERR, pcish5_serr_irq,
-                        IRQF_DISABLED, "PCI SERR interrupt", NULL) < 0) {
+                        0, "PCI SERR interrupt", NULL) < 0) {
                 printk(KERN_ERR "PCISH5: Cannot hook PCI_SERR interrupt\n");
                 return -EINVAL;
         }
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c
index edb7cca14882..fa7b978cc727 100644
--- a/arch/sh/drivers/pci/pci-sh7780.c
+++ b/arch/sh/drivers/pci/pci-sh7780.c
@@ -172,7 +172,7 @@ static int __init sh7780_pci_setup_irqs(struct pci_channel *hose)
                      PCI_STATUS_SIG_TARGET_ABORT | \
                      PCI_STATUS_PARITY, hose->reg_base + PCI_STATUS);
 
-        ret = request_irq(hose->serr_irq, sh7780_pci_serr_irq, IRQF_DISABLED,
+        ret = request_irq(hose->serr_irq, sh7780_pci_serr_irq, 0,
                           "PCI SERR interrupt", hose);
         if (unlikely(ret)) {
                 printk(KERN_ERR "PCI: Failed hooking SERR IRQ\n");
diff --git a/arch/sh/drivers/push-switch.c b/arch/sh/drivers/push-switch.c
index afc24556572b..637b79b09657 100644
--- a/arch/sh/drivers/push-switch.c
+++ b/arch/sh/drivers/push-switch.c
@@ -63,7 +63,7 @@ static int switch_drv_probe(struct platform_device *pdev)
         BUG_ON(!psw_info);
 
         ret = request_irq(irq, psw_info->irq_handler,
-                          IRQF_DISABLED | psw_info->irq_flags,
+                          psw_info->irq_flags,
                           psw_info->name ? psw_info->name : DRV_NAME, pdev);
         if (unlikely(ret < 0))
                 goto err;