Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 14:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

compal-laptop: Use devm_kzalloc to allocate local data structure

Browse Source 
Reduce code size and simplify error path.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
This commit is contained in:
Guenter Roeck 2013-11-23 11:03:19 -08:00 committed by Matthew Garrett
parent 7da8fb27ef
commit cf508f4496
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/platform/x86/compal-laptop.c
View File

@ -1026,24 +1026,21 @@ static int compal_probe(struct platform_device *pdev)
return 0;
/* Fan control */
data = kzalloc(sizeof(struct compal_data), GFP_KERNEL);
data = devm_kzalloc(&pdev->dev, sizeof(struct compal_data), GFP_KERNEL);
if (!data)
return -ENOMEM;
initialize_fan_control_data(data);
err = sysfs_create_group(&pdev->dev.kobj, &compal_attribute_group);
if (err) {
kfree(data);
if (err)
return err;
}
data->hwmon_dev = hwmon_device_register(&pdev->dev);
if (IS_ERR(data->hwmon_dev)) {
err = PTR_ERR(data->hwmon_dev);
sysfs_remove_group(&pdev->dev.kobj,
&compal_attribute_group);
kfree(data);
return err;
}
@ -1083,8 +1080,6 @@ static int compal_remove(struct platform_device *pdev)
hwmon_device_unregister(data->hwmon_dev);
power_supply_unregister(&data->psy);
kfree(data);
sysfs_remove_group(&pdev->dev.kobj, &compal_attribute_group);
return 0;