dma: replace devm_request_and_ioremap by devm_ioremap_resource
authorJulia Lawall <Julia.Lawall@lip6.fr>
Mon, 19 Aug 2013 11:20:38 +0000 (13:20 +0200)
committerVinod Koul <vinod.koul@intel.com>
Mon, 2 Sep 2013 12:07:07 +0000 (17:37 +0530)
Use devm_ioremap_resource instead of devm_request_and_ioremap.

This was done using the semantic patch
scripts/coccinelle/api/devm_ioremap_resource.cocci

The relevant call to platform_get_resource was manually moved down to the
call to devm_ioremap_resource.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/sh/sudmac.c

index c49441753d995464796e1686442ea042fa5b3a4d..8369c6f02dcc77915671d61045ad122328b4c544 100644 (file)
@@ -345,9 +345,8 @@ static int sudmac_probe(struct platform_device *pdev)
        if (!pdata)
                return -ENODEV;
 
-       chan = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (!chan || !irq_res)
+       if (!irq_res)
                return -ENODEV;
 
        err = -ENOMEM;
@@ -360,9 +359,10 @@ static int sudmac_probe(struct platform_device *pdev)
 
        dma_dev = &su_dev->shdma_dev.dma_dev;
 
-       su_dev->chan_reg = devm_request_and_ioremap(&pdev->dev, chan);
-       if (!su_dev->chan_reg)
-               return err;
+       chan = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       su_dev->chan_reg = devm_ioremap_resource(&pdev->dev, chan);
+       if (IS_ERR(su_dev->chan_reg))
+               return PTR_ERR(su_dev->chan_reg);
 
        dma_cap_set(DMA_SLAVE, dma_dev->cap_mask);