Skip to content

Commit

Permalink
pcf50633-charger: Use devm_kzalloc()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jingoo Han authored and Anton Vorontsov committed Apr 1, 2013
1 parent b852ac5 commit c09dd7d
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/power/pcf50633-charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -413,15 +413,13 @@ 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;
}

ret = power_supply_register(&pdev->dev, &mbc->usb);
if (ret) {
dev_err(mbc->pcf->dev, "failed to register usb\n");
power_supply_unregister(&mbc->adapter);
kfree(mbc);
return ret;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit c09dd7d

Please sign in to comment.