isp1704_charger: Use devm_kzalloc()
authorJingoo Han <jg1.han@samsung.com>
Mon, 11 Mar 2013 06:34:15 +0000 (15:34 +0900)
committerAnton Vorontsov <anton@enomsg.org>
Mon, 1 Apr 2013 06:25:40 +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/isp1704_charger.c

index 176ad59..fc04d19 100644 (file)
@@ -411,7 +411,7 @@ static int isp1704_charger_probe(struct platform_device *pdev)
        struct isp1704_charger  *isp;
        int                     ret = -ENODEV;
 
-       isp = kzalloc(sizeof *isp, GFP_KERNEL);
+       isp = devm_kzalloc(&pdev->dev, sizeof(*isp), GFP_KERNEL);
        if (!isp)
                return -ENOMEM;
 
@@ -477,8 +477,6 @@ fail1:
        isp1704_charger_set_power(isp, 0);
        usb_put_phy(isp->phy);
 fail0:
-       kfree(isp);
-
        dev_err(&pdev->dev, "failed to register isp1704 with error %d\n", ret);
 
        return ret;
@@ -492,7 +490,6 @@ static int isp1704_charger_remove(struct platform_device *pdev)
        power_supply_unregister(&isp->psy);
        usb_put_phy(isp->phy);
        isp1704_charger_set_power(isp, 0);
-       kfree(isp);
 
        return 0;
 }