diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-03-11 15:33:27 +0900 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-03-31 23:25:42 -0700 |
| commit | b92ff855b97795d8be3115c0aff04f6efb5a53aa (patch) | |
| tree | 07723ea4924d043aad6dd20638cc40c2aaa59a65 /drivers/power | |
| parent | 2a2ce52a4006db6c7831f1b21f1b0cc892516e85 (diff) | |
| download | linux-3.10-b92ff855b97795d8be3115c0aff04f6efb5a53aa.tar.gz linux-3.10-b92ff855b97795d8be3115c0aff04f6efb5a53aa.tar.bz2 linux-3.10-b92ff855b97795d8be3115c0aff04f6efb5a53aa.zip | |
gpio-charger: Use devm_kzalloc()
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>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/gpio-charger.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c index e3e40a9f3af..e9883eeeee7 100644 --- a/drivers/power/gpio-charger.c +++ b/drivers/power/gpio-charger.c @@ -86,7 +86,8 @@ static int gpio_charger_probe(struct platform_device *pdev) return -EINVAL; } - gpio_charger = kzalloc(sizeof(*gpio_charger), GFP_KERNEL); + gpio_charger = devm_kzalloc(&pdev->dev, sizeof(*gpio_charger), + GFP_KERNEL); if (!gpio_charger) { dev_err(&pdev->dev, "Failed to alloc driver structure\n"); return -ENOMEM; @@ -140,7 +141,6 @@ static int gpio_charger_probe(struct platform_device *pdev) err_gpio_free: gpio_free(pdata->gpio); err_free: - kfree(gpio_charger); return ret; } @@ -156,7 +156,6 @@ static int gpio_charger_remove(struct platform_device *pdev) gpio_free(gpio_charger->pdata->gpio); platform_set_drvdata(pdev, NULL); - kfree(gpio_charger); return 0; } |