Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ds2780_battery: 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>

authored by

Jingoo Han and committed by
Anton Vorontsov
2cb12122 b92ff855

+2 -5
+2 -5
drivers/power/ds2780_battery.c
··· 760 760 int ret = 0; 761 761 struct ds2780_device_info *dev_info; 762 762 763 - dev_info = kzalloc(sizeof(*dev_info), GFP_KERNEL); 763 + dev_info = devm_kzalloc(&pdev->dev, sizeof(*dev_info), GFP_KERNEL); 764 764 if (!dev_info) { 765 765 ret = -ENOMEM; 766 766 goto fail; ··· 779 779 ret = power_supply_register(&pdev->dev, &dev_info->bat); 780 780 if (ret) { 781 781 dev_err(dev_info->dev, "failed to register battery\n"); 782 - goto fail_free_info; 782 + goto fail; 783 783 } 784 784 785 785 ret = sysfs_create_group(&dev_info->bat.dev->kobj, &ds2780_attr_group); ··· 813 813 sysfs_remove_group(&dev_info->bat.dev->kobj, &ds2780_attr_group); 814 814 fail_unregister: 815 815 power_supply_unregister(&dev_info->bat); 816 - fail_free_info: 817 - kfree(dev_info); 818 816 fail: 819 817 return ret; 820 818 } ··· 826 828 827 829 power_supply_unregister(&dev_info->bat); 828 830 829 - kfree(dev_info); 830 831 return 0; 831 832 } 832 833