Merge branch 'for-mfd-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

2 files changed, 12 insertions, 40 deletions

diff --git a/drivers/mfd/davinci_voicecodec.c b/drivers/mfd/davinci_voicecodec.c
index b6e297363946..fb64398506e9 100644
--- a/drivers/mfd/davinci_voicecodec.c
+++ b/drivers/mfd/davinci_voicecodec.c
@@ -46,7 +46,7 @@ void davinci_vc_write(struct davinci_vc *davinci_vc,
 static int __init davinci_vc_probe(struct platform_device *pdev)
 {
         struct davinci_vc *davinci_vc;
-        struct resource *res, *mem;
+        struct resource *res;
         struct mfd_cell *cell = NULL;
         int ret;
 
@@ -58,7 +58,7 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
-        davinci_vc->clk = clk_get(&pdev->dev, NULL);
+        davinci_vc->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(davinci_vc->clk)) {
                 dev_dbg(&pdev->dev,
                             "could not get the clock for voice codec\n");
@@ -67,35 +67,18 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
         clk_enable(davinci_vc->clk);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(&pdev->dev, "no mem resource\n");
-                ret = -ENODEV;
-                goto fail2;
-        }
-
-        davinci_vc->pbase = res->start;
-        davinci_vc->base_size = resource_size(res);
 
-        mem = request_mem_region(davinci_vc->pbase, davinci_vc->base_size,
-                                 pdev->name);
-        if (!mem) {
-                dev_err(&pdev->dev, "VCIF region already claimed\n");
-                ret = -EBUSY;
-                goto fail2;
-        }
-
-        davinci_vc->base = ioremap(davinci_vc->pbase, davinci_vc->base_size);
-        if (!davinci_vc->base) {
-                dev_err(&pdev->dev, "can't ioremap mem resource.\n");
-                ret = -ENOMEM;
-                goto fail3;
+        davinci_vc->base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(davinci_vc->base)) {
+                ret = PTR_ERR(davinci_vc->base);
+                goto fail;
         }
 
         res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
         if (!res) {
                 dev_err(&pdev->dev, "no DMA resource\n");
                 ret = -ENXIO;
-                goto fail4;
+                goto fail;
         }
 
         davinci_vc->davinci_vcif.dma_tx_channel = res->start;
@@ -106,7 +89,7 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
         if (!res) {
                 dev_err(&pdev->dev, "no DMA resource\n");
                 ret = -ENXIO;
-                goto fail4;
+                goto fail;
         }
 
         davinci_vc->davinci_vcif.dma_rx_channel = res->start;
@@ -132,19 +115,13 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
                               DAVINCI_VC_CELLS, NULL, 0, NULL);
         if (ret != 0) {
                 dev_err(&pdev->dev, "fail to register client devices\n");
-                goto fail4;
+                goto fail;
         }
 
         return 0;
 
-fail4:
-        iounmap(davinci_vc->base);
-fail3:
-        release_mem_region(davinci_vc->pbase, davinci_vc->base_size);
-fail2:
+fail:
         clk_disable(davinci_vc->clk);
-        clk_put(davinci_vc->clk);
-        davinci_vc->clk = NULL;
 
         return ret;
 }
@@ -155,12 +132,7 @@ static int davinci_vc_remove(struct platform_device *pdev)
 
         mfd_remove_devices(&pdev->dev);
 
-        iounmap(davinci_vc->base);
-        release_mem_region(davinci_vc->pbase, davinci_vc->base_size);
-
         clk_disable(davinci_vc->clk);
-        clk_put(davinci_vc->clk);
-        davinci_vc->clk = NULL;
 
         return 0;
 }
diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c
index f2e0ad4b332e..26aca545084b 100644
--- a/drivers/mfd/htc-egpio.c
+++ b/drivers/mfd/htc-egpio.c
@@ -286,7 +286,8 @@ static int __init egpio_probe(struct platform_device *pdev)
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res)
                 goto fail;
-        ei->base_addr = ioremap_nocache(res->start, resource_size(res));
+        ei->base_addr = devm_ioremap_nocache(&pdev->dev, res->start,
+                                             resource_size(res));
         if (!ei->base_addr)
                 goto fail;
         pr_debug("EGPIO phys=%08x virt=%p\n", (u32)res->start, ei->base_addr);
@@ -380,7 +381,6 @@ static int __exit egpio_remove(struct platform_device *pdev)
                 irq_set_chained_handler(ei->chained_irq, NULL);
                 device_init_wakeup(&pdev->dev, 0);
         }
-        iounmap(ei->base_addr);
 
         return 0;
 }