|
@@ -760,7 +760,7 @@ static int ds2780_battery_probe(struct platform_device *pdev)
|
|
|
int ret = 0;
|
|
|
struct ds2780_device_info *dev_info;
|
|
|
|
|
|
- dev_info = kzalloc(sizeof(*dev_info), GFP_KERNEL);
|
|
|
+ dev_info = devm_kzalloc(&pdev->dev, sizeof(*dev_info), GFP_KERNEL);
|
|
|
if (!dev_info) {
|
|
|
ret = -ENOMEM;
|
|
|
goto fail;
|
|
@@ -779,7 +779,7 @@ static int ds2780_battery_probe(struct platform_device *pdev)
|
|
|
ret = power_supply_register(&pdev->dev, &dev_info->bat);
|
|
|
if (ret) {
|
|
|
dev_err(dev_info->dev, "failed to register battery\n");
|
|
|
- goto fail_free_info;
|
|
|
+ goto fail;
|
|
|
}
|
|
|
|
|
|
ret = sysfs_create_group(&dev_info->bat.dev->kobj, &ds2780_attr_group);
|
|
@@ -813,8 +813,6 @@ fail_remove_group:
|
|
|
sysfs_remove_group(&dev_info->bat.dev->kobj, &ds2780_attr_group);
|
|
|
fail_unregister:
|
|
|
power_supply_unregister(&dev_info->bat);
|
|
|
-fail_free_info:
|
|
|
- kfree(dev_info);
|
|
|
fail:
|
|
|
return ret;
|
|
|
}
|
|
@@ -828,7 +826,6 @@ static int ds2780_battery_remove(struct platform_device *pdev)
|
|
|
|
|
|
power_supply_unregister(&dev_info->bat);
|
|
|
|
|
|
- kfree(dev_info);
|
|
|
return 0;
|
|
|
}
|
|
|
|