Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[cascardo/linux.git] / drivers / power / jz4740-battery.c

diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index 74ac69e..bf91489 100644 (file)
--- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c
@@ -33,7 +33,6 @@ struct jz_battery {
        struct jz_battery_platform_data *pdata;
        struct platform_device *pdev;
 
-       struct resource *mem;
        void __iomem *base;
 
        int irq;
@@ -244,13 +243,14 @@ static int jz_battery_probe(struct platform_device *pdev)
        struct jz_battery_platform_data *pdata = pdev->dev.parent->platform_data;
        struct jz_battery *jz_battery;
        struct power_supply *battery;
+       struct resource *mem;
 
        if (!pdata) {
                dev_err(&pdev->dev, "No platform_data supplied\n");
                return -ENXIO;
        }
 
-       jz_battery = kzalloc(sizeof(*jz_battery), GFP_KERNEL);
+       jz_battery = devm_kzalloc(&pdev->dev, sizeof(*jz_battery), GFP_KERNEL);
        if (!jz_battery) {
                dev_err(&pdev->dev, "Failed to allocate driver structure\n");
                return -ENOMEM;
@@ -260,33 +260,15 @@ static int jz_battery_probe(struct platform_device *pdev)
 
        jz_battery->irq = platform_get_irq(pdev, 0);
        if (jz_battery->irq < 0) {
-               ret = jz_battery->irq;
                dev_err(&pdev->dev, "Failed to get platform irq: %d\n", ret);
-               goto err_free;
+               return jz_battery->irq;
        }
 
-       jz_battery->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!jz_battery->mem) {
-               ret = -ENOENT;
-               dev_err(&pdev->dev, "Failed to get platform mmio resource\n");
-               goto err_free;
-       }
+       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       jz_battery->mem = request_mem_region(jz_battery->mem->start,
-                               resource_size(jz_battery->mem), pdev->name);
-       if (!jz_battery->mem) {
-               ret = -EBUSY;
-               dev_err(&pdev->dev, "Failed to request mmio memory region\n");
-               goto err_free;
-       }
-
-       jz_battery->base = ioremap_nocache(jz_battery->mem->start,
-                               resource_size(jz_battery->mem));
-       if (!jz_battery->base) {
-               ret = -EBUSY;
-               dev_err(&pdev->dev, "Failed to ioremap mmio memory\n");
-               goto err_release_mem_region;
-       }
+       jz_battery->base = devm_request_and_ioremap(&pdev->dev, mem);
+       if (!jz_battery->base)
+               return -EBUSY;
 
        battery = &jz_battery->battery;
        battery->name = pdata->info.name;
@@ -309,7 +291,7 @@ static int jz_battery_probe(struct platform_device *pdev)
                        jz_battery);
        if (ret) {
                dev_err(&pdev->dev, "Failed to request irq %d\n", ret);
-               goto err_iounmap;
+               goto err;
        }
        disable_irq(jz_battery->irq);
 
@@ -366,13 +348,8 @@ err_free_gpio:
                gpio_free(jz_battery->pdata->gpio_charge);
 err_free_irq:
        free_irq(jz_battery->irq, jz_battery);
-err_iounmap:
+err:
        platform_set_drvdata(pdev, NULL);
-       iounmap(jz_battery->base);
-err_release_mem_region:
-       release_mem_region(jz_battery->mem->start, resource_size(jz_battery->mem));
-err_free:
-       kfree(jz_battery);
        return ret;
 }
 
@@ -392,10 +369,6 @@ static int jz_battery_remove(struct platform_device *pdev)
 
        free_irq(jz_battery->irq, jz_battery);
 
-       iounmap(jz_battery->base);
-       release_mem_region(jz_battery->mem->start, resource_size(jz_battery->mem));
-       kfree(jz_battery);
-
        return 0;
 }