i2c: bfin: turn to Resource-managed API in probe function

No need to free managed resources any more.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index e6d5162b637928d2c20cb2aa0844d05992547836..3e271e7558d3dfb86705d5f401cd2a34fb7c426d 100644 (file)
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -620,35 +620,27 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
        int rc;
        unsigned int clkhilow;
 
-       iface = kzalloc(sizeof(struct bfin_twi_iface), GFP_KERNEL);
+       iface = devm_kzalloc(&pdev->dev, sizeof(struct bfin_twi_iface),
+                       GFP_KERNEL);
        if (!iface) {
                dev_err(&pdev->dev, "Cannot allocate memory\n");
-               rc = -ENOMEM;
-               goto out_error_nomem;
+               return -ENOMEM;
        }
 
        spin_lock_init(&(iface->lock));
 
        /* Find and map our resources */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res == NULL) {
-               dev_err(&pdev->dev, "Cannot get IORESOURCE_MEM\n");
-               rc = -ENOENT;
-               goto out_error_get_res;
-       }
-
-       iface->regs_base = ioremap(res->start, resource_size(res));
-       if (iface->regs_base == NULL) {
+       iface->regs_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(iface->regs_base)) {
                dev_err(&pdev->dev, "Cannot map IO\n");
-               rc = -ENXIO;
-               goto out_error_ioremap;
+               return PTR_ERR(iface->regs_base);
        }
 
        iface->irq = platform_get_irq(pdev, 0);
        if (iface->irq < 0) {
                dev_err(&pdev->dev, "No IRQ specified\n");
-               rc = -ENOENT;
-               goto out_error_no_irq;
+               return -ENOENT;
        }
 
        p_adap = &iface->adap;
@@ -666,15 +658,15 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
                        "i2c-bfin-twi");
        if (rc) {
                dev_err(&pdev->dev, "Can't setup pin mux!\n");
-               goto out_error_pin_mux;
+               return -EBUSY;
        }
 
-       rc = request_irq(iface->irq, bfin_twi_interrupt_entry,
+       rc = devm_request_irq(&pdev->dev, iface->irq, bfin_twi_interrupt_entry,
                0, pdev->name, iface);
        if (rc) {
                dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq);
                rc = -ENODEV;
-               goto out_error_req_irq;
+               goto out_error;
        }
 
        /* Set TWI internal clock as 10MHz */
@@ -695,7 +687,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
        rc = i2c_add_numbered_adapter(p_adap);
        if (rc < 0) {
                dev_err(&pdev->dev, "Can't add i2c adapter!\n");
-               goto out_error_add_adapter;
+               goto out_error;
        }
 
        platform_set_drvdata(pdev, iface);
@@ -705,17 +697,8 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
 
        return 0;
 
-out_error_add_adapter:
-       free_irq(iface->irq, iface);
-out_error_req_irq:
-out_error_no_irq:
+out_error:
        peripheral_free_list(dev_get_platdata(&pdev->dev));
-out_error_pin_mux:
-       iounmap(iface->regs_base);
-out_error_ioremap:
-out_error_get_res:
-       kfree(iface);
-out_error_nomem:
        return rc;
 }
 
@@ -724,10 +707,7 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev)
        struct bfin_twi_iface *iface = platform_get_drvdata(pdev);
 
        i2c_del_adapter(&(iface->adap));
-       free_irq(iface->irq, iface);
        peripheral_free_list(dev_get_platdata(&pdev->dev));
-       iounmap(iface->regs_base);
-       kfree(iface);
 
        return 0;
 }