diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-03-11 15:36:19 +0900 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-03-31 23:24:37 -0700 |
| commit | f11d018fd6f24e611e06d6aedd91c59831b3bf05 (patch) | |
| tree | 7f189b5dbf48b08f678803c76b5539b7a6f6fede /drivers/power | |
| parent | 594f8f888d325591851f419c22e0349263214eff (diff) | |
| download | blackbird-obmc-linux-f11d018fd6f24e611e06d6aedd91c59831b3bf05.tar.gz blackbird-obmc-linux-f11d018fd6f24e611e06d6aedd91c59831b3bf05.zip | |
wm831x_backup: 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/wm831x_backup.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c index d9cc169f1424..58cbb009b74f 100644 --- a/drivers/power/wm831x_backup.c +++ b/drivers/power/wm831x_backup.c @@ -169,7 +169,8 @@ static int wm831x_backup_probe(struct platform_device *pdev) struct power_supply *backup; int ret; - devdata = kzalloc(sizeof(struct wm831x_backup), GFP_KERNEL); + devdata = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_backup), + GFP_KERNEL); if (devdata == NULL) return -ENOMEM; @@ -197,14 +198,8 @@ static int wm831x_backup_probe(struct platform_device *pdev) backup->num_properties = ARRAY_SIZE(wm831x_backup_props); backup->get_property = wm831x_backup_get_prop; ret = power_supply_register(&pdev->dev, backup); - if (ret) - goto err_kmalloc; return ret; - -err_kmalloc: - kfree(devdata); - return ret; } static int wm831x_backup_remove(struct platform_device *pdev) @@ -213,7 +208,6 @@ static int wm831x_backup_remove(struct platform_device *pdev) power_supply_unregister(&devdata->backup); kfree(devdata->backup.name); - kfree(devdata); return 0; } |
