Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[karo-tx-linux.git] / drivers / dma / dw_dmac.c

diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index c3159abf9ac172575fab54c75eda6a6df29a0815..c599558faedaf29128a5a10bb15eaed7dbc5d41c 100644 (file)
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -15,6 +15,7 @@
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
@@ -1648,9 +1649,9 @@ static int dw_probe(struct platform_device *pdev)
        if (irq < 0)
                return irq;
 
-       regs = devm_request_and_ioremap(&pdev->dev, io);
-       if (!regs)
-               return -EBUSY;
+       regs = devm_ioremap_resource(&pdev->dev, io);
+       if (IS_ERR(regs))
+               return PTR_ERR(regs);
 
        /* Apply default dma_mask if needed */
        if (!pdev->dev.dma_mask) {
@@ -1836,7 +1837,7 @@ static int dw_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int __devexit dw_remove(struct platform_device *pdev)
+static int dw_remove(struct platform_device *pdev)
 {
        struct dw_dma           *dw = platform_get_drvdata(pdev);
        struct dw_dma_chan      *dwc, *_dwc;