i2c: xilinx: Use devm_* functions

Simplified the probe and remove functions using devm_* functions

Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

1 files changed, 15 insertions, 50 deletions

diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 2d559896c678..6f9918f37b91 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -32,6 +32,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/errno.h>
+#include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
@@ -697,33 +698,21 @@ static int xiic_i2c_probe(struct platform_device *pdev)
         int ret, irq;
         u8 i;
 
+        i2c = devm_kzalloc(&pdev->dev, sizeof(*i2c), GFP_KERNEL);
+        if (!i2c)
+                return -ENOMEM;
+
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res)
-                goto resource_missing;
+        i2c->base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(i2c->base))
+                return PTR_ERR(i2c->base);
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0)
-                goto resource_missing;
+                return irq;
 
         pdata = dev_get_platdata(&pdev->dev);
 
-        i2c = kzalloc(sizeof(*i2c), GFP_KERNEL);
-        if (!i2c)
-                return -ENOMEM;
-
-        if (!request_mem_region(res->start, resource_size(res), pdev->name)) {
-                dev_err(&pdev->dev, "Memory region busy\n");
-                ret = -EBUSY;
-                goto request_mem_failed;
-        }
-
-        i2c->base = ioremap(res->start, resource_size(res));
-        if (!i2c->base) {
-                dev_err(&pdev->dev, "Unable to map registers\n");
-                ret = -EIO;
-                goto map_failed;
-        }
-
         /* hook up driver to tree */
         platform_set_drvdata(pdev, i2c);
         i2c->adap = xiic_adapter;
@@ -733,10 +722,11 @@ static int xiic_i2c_probe(struct platform_device *pdev)
 
         spin_lock_init(&i2c->lock);
         init_waitqueue_head(&i2c->wait);
-        ret = request_irq(irq, xiic_isr, 0, pdev->name, i2c);
-        if (ret) {
+
+        ret = devm_request_irq(&pdev->dev, irq, xiic_isr, 0, pdev->name, i2c);
+        if (ret < 0) {
                 dev_err(&pdev->dev, "Cannot claim IRQ\n");
-                goto request_irq_failed;
+                return ret;
         }
 
         xiic_reinit(i2c);
@@ -745,7 +735,8 @@ static int xiic_i2c_probe(struct platform_device *pdev)
         ret = i2c_add_adapter(&i2c->adap);
         if (ret) {
                 dev_err(&pdev->dev, "Failed to add adapter\n");
-                goto add_adapter_failed;
+                xiic_deinit(i2c);
+                return ret;
         }
 
         if (pdata) {
@@ -755,43 +746,17 @@ static int xiic_i2c_probe(struct platform_device *pdev)
         }
 
         return 0;
-
-add_adapter_failed:
-        free_irq(irq, i2c);
-request_irq_failed:
-        xiic_deinit(i2c);
-        iounmap(i2c->base);
-map_failed:
-        release_mem_region(res->start, resource_size(res));
-request_mem_failed:
-        kfree(i2c);
-
-        return ret;
-resource_missing:
-        dev_err(&pdev->dev, "IRQ or Memory resource is missing\n");
-        return -ENOENT;
 }
 
 static int xiic_i2c_remove(struct platform_device *pdev)
 {
         struct xiic_i2c *i2c = platform_get_drvdata(pdev);
-        struct resource *res;
 
         /* remove adapter & data */
         i2c_del_adapter(&i2c->adap);
 
         xiic_deinit(i2c);
 
-        free_irq(platform_get_irq(pdev, 0), i2c);
-
-        iounmap(i2c->base);
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (res)
-                release_mem_region(res->start, resource_size(res));
-
-        kfree(i2c);
-
         return 0;
 }