]> git.karo-electronics.de Git - linux-beck.git/commitdiff
pcf50633-charger: Use devm_kzalloc()
authorJingoo Han <jg1.han@samsung.com>
Mon, 11 Mar 2013 06:35:38 +0000 (15:35 +0900)
committerAnton Vorontsov <anton@enomsg.org>
Mon, 1 Apr 2013 06:25:32 +0000 (23:25 -0700)
Use devm_kzalloc() to make cleanup paths more simple.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
drivers/power/pcf50633-charger.c

index c2122a7ad06577449f980f31e3f43183cfe4a0ac..17fd77f24b2ab3ea8b0e05b392dd038534a19b03 100644 (file)
@@ -373,7 +373,7 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
        int i;
        u8 mbcs1;
 
-       mbc = kzalloc(sizeof(*mbc), GFP_KERNEL);
+       mbc = devm_kzalloc(&pdev->dev, sizeof(*mbc), GFP_KERNEL);
        if (!mbc)
                return -ENOMEM;
 
@@ -413,7 +413,6 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
        ret = power_supply_register(&pdev->dev, &mbc->adapter);
        if (ret) {
                dev_err(mbc->pcf->dev, "failed to register adapter\n");
-               kfree(mbc);
                return ret;
        }
 
@@ -421,7 +420,6 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
        if (ret) {
                dev_err(mbc->pcf->dev, "failed to register usb\n");
                power_supply_unregister(&mbc->adapter);
-               kfree(mbc);
                return ret;
        }
 
@@ -430,7 +428,6 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
                dev_err(mbc->pcf->dev, "failed to register ac\n");
                power_supply_unregister(&mbc->adapter);
                power_supply_unregister(&mbc->usb);
-               kfree(mbc);
                return ret;
        }
 
@@ -461,8 +458,6 @@ static int pcf50633_mbc_remove(struct platform_device *pdev)
        power_supply_unregister(&mbc->adapter);
        power_supply_unregister(&mbc->ac);
 
-       kfree(mbc);
-
        return 0;
 }