4 files changed, 6 insertions, 7 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;