aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2013-10-13 01:10:51 -0400
committerVinod Koul <vinod.koul@intel.com>2013-10-13 10:51:35 -0400
commit174b537ac2b8fe1bac31039185b80f873716c5a1 (patch)
tree2b0361fa5e7986319ccec1420994ed1101ac067b
parent05864648f39a3b2ee8311b44dfd4b06cbb904414 (diff)
dma: misc: remove deprecated IRQF_DISABLED
This patch proposes to remove the use of the IRQF_DISABLED flag It's a NOOP since 2.6.35 and it will be removed one day. Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--drivers/dma/amba-pl08x.c3
-rw-r--r--drivers/dma/k3dma.c2
-rw-r--r--drivers/dma/mmp_pdma.c4
-rw-r--r--drivers/dma/mmp_tdma.c4
-rw-r--r--drivers/dma/sh/shdmac.c4
5 files changed, 8 insertions, 9 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index fce46c5bf1c7..9b5025777ac8 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -2133,8 +2133,7 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
2133 writel(0x000000FF, pl08x->base + PL080_ERR_CLEAR); 2133 writel(0x000000FF, pl08x->base + PL080_ERR_CLEAR);
2134 writel(0x000000FF, pl08x->base + PL080_TC_CLEAR); 2134 writel(0x000000FF, pl08x->base + PL080_TC_CLEAR);
2135 2135
2136 ret = request_irq(adev->irq[0], pl08x_irq, IRQF_DISABLED, 2136 ret = request_irq(adev->irq[0], pl08x_irq, 0, DRIVER_NAME, pl08x);
2137 DRIVER_NAME, pl08x);
2138 if (ret) { 2137 if (ret) {
2139 dev_err(&adev->dev, "%s failed to request interrupt %d\n", 2138 dev_err(&adev->dev, "%s failed to request interrupt %d\n",
2140 __func__, adev->irq[0]); 2139 __func__, adev->irq[0]);
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index a2c330f5f952..da430623fbc4 100644
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -693,7 +693,7 @@ static int k3_dma_probe(struct platform_device *op)
693 693
694 irq = platform_get_irq(op, 0); 694 irq = platform_get_irq(op, 0);
695 ret = devm_request_irq(&op->dev, irq, 695 ret = devm_request_irq(&op->dev, irq,
696 k3_dma_int_handler, IRQF_DISABLED, DRIVER_NAME, d); 696 k3_dma_int_handler, 0, DRIVER_NAME, d);
697 if (ret) 697 if (ret)
698 return ret; 698 return ret;
699 699
diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c
index 558994f38822..dcb1e05149a7 100644
--- a/drivers/dma/mmp_pdma.c
+++ b/drivers/dma/mmp_pdma.c
@@ -862,7 +862,7 @@ static int mmp_pdma_chan_init(struct mmp_pdma_device *pdev,
862 862
863 if (irq) { 863 if (irq) {
864 ret = devm_request_irq(pdev->dev, irq, 864 ret = devm_request_irq(pdev->dev, irq,
865 mmp_pdma_chan_handler, IRQF_DISABLED, "pdma", phy); 865 mmp_pdma_chan_handler, 0, "pdma", phy);
866 if (ret) { 866 if (ret) {
867 dev_err(pdev->dev, "channel request irq fail!\n"); 867 dev_err(pdev->dev, "channel request irq fail!\n");
868 return ret; 868 return ret;
@@ -969,7 +969,7 @@ static int mmp_pdma_probe(struct platform_device *op)
969 /* all chan share one irq, demux inside */ 969 /* all chan share one irq, demux inside */
970 irq = platform_get_irq(op, 0); 970 irq = platform_get_irq(op, 0);
971 ret = devm_request_irq(pdev->dev, irq, 971 ret = devm_request_irq(pdev->dev, irq,
972 mmp_pdma_int_handler, IRQF_DISABLED, "pdma", pdev); 972 mmp_pdma_int_handler, 0, "pdma", pdev);
973 if (ret) 973 if (ret)
974 return ret; 974 return ret;
975 } 975 }
diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index 38cb517fb2eb..ea5c3d26dd35 100644
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -324,7 +324,7 @@ static int mmp_tdma_alloc_chan_resources(struct dma_chan *chan)
324 324
325 if (tdmac->irq) { 325 if (tdmac->irq) {
326 ret = devm_request_irq(tdmac->dev, tdmac->irq, 326 ret = devm_request_irq(tdmac->dev, tdmac->irq,
327 mmp_tdma_chan_handler, IRQF_DISABLED, "tdma", tdmac); 327 mmp_tdma_chan_handler, 0, "tdma", tdmac);
328 if (ret) 328 if (ret)
329 return ret; 329 return ret;
330 } 330 }
@@ -559,7 +559,7 @@ static int mmp_tdma_probe(struct platform_device *pdev)
559 if (irq_num != chan_num) { 559 if (irq_num != chan_num) {
560 irq = platform_get_irq(pdev, 0); 560 irq = platform_get_irq(pdev, 0);
561 ret = devm_request_irq(&pdev->dev, irq, 561 ret = devm_request_irq(&pdev->dev, irq,
562 mmp_tdma_int_handler, IRQF_DISABLED, "tdma", tdev); 562 mmp_tdma_int_handler, 0, "tdma", tdev);
563 if (ret) 563 if (ret)
564 return ret; 564 return ret;
565 } 565 }
diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
index 1069e8869f20..0d765c0e21ec 100644
--- a/drivers/dma/sh/shdmac.c
+++ b/drivers/dma/sh/shdmac.c
@@ -685,7 +685,7 @@ MODULE_DEVICE_TABLE(of, sh_dmae_of_match);
685static int sh_dmae_probe(struct platform_device *pdev) 685static int sh_dmae_probe(struct platform_device *pdev)
686{ 686{
687 const struct sh_dmae_pdata *pdata; 687 const struct sh_dmae_pdata *pdata;
688 unsigned long irqflags = IRQF_DISABLED, 688 unsigned long irqflags = 0,
689 chan_flag[SH_DMAE_MAX_CHANNELS] = {}; 689 chan_flag[SH_DMAE_MAX_CHANNELS] = {};
690 int errirq, chan_irq[SH_DMAE_MAX_CHANNELS]; 690 int errirq, chan_irq[SH_DMAE_MAX_CHANNELS];
691 int err, i, irq_cnt = 0, irqres = 0, irq_cap = 0; 691 int err, i, irq_cnt = 0, irqres = 0, irq_cap = 0;
@@ -838,7 +838,7 @@ static int sh_dmae_probe(struct platform_device *pdev)
838 IORESOURCE_IRQ_SHAREABLE) 838 IORESOURCE_IRQ_SHAREABLE)
839 chan_flag[irq_cnt] = IRQF_SHARED; 839 chan_flag[irq_cnt] = IRQF_SHARED;
840 else 840 else
841 chan_flag[irq_cnt] = IRQF_DISABLED; 841 chan_flag[irq_cnt] = 0;
842 dev_dbg(&pdev->dev, 842 dev_dbg(&pdev->dev,
843 "Found IRQ %d for channel %d\n", 843 "Found IRQ %d for channel %d\n",
844 i, irq_cnt); 844 i, irq_cnt);