public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hwmon: (coretemp) Allocate platform data with devm_kzalloc

Browse source 
This simplifies error handling.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Tested-by: Jean Delvare <jdelvare@suse.de>
This commit is contained in:
Guenter Roeck 2014-02-16 15:29:55 -08:00
parent 1075305de4
commit c503a811e4
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/hwmon/coretemp.c
View file

@ -582,22 +582,23 @@ static void coretemp_remove_core(struct platform_data *pdata,
static int coretemp_probe(struct platform_device *pdev) static int coretemp_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev;
struct platform_data *pdata; struct platform_data *pdata;
int err; int err;
/* Initialize the per-package data structures */ /* Initialize the per-package data structures */
pdata = kzalloc(sizeof(struct platform_data), GFP_KERNEL); pdata = devm_kzalloc(dev, sizeof(struct platform_data), GFP_KERNEL);
if (!pdata) if (!pdata)
return -ENOMEM; return -ENOMEM;
err = create_name_attr(pdata, &pdev->dev); err = create_name_attr(pdata, dev);
if (err) if (err)
goto exit_free; return err;
pdata->phys_proc_id = pdev->id; pdata->phys_proc_id = pdev->id;
platform_set_drvdata(pdev, pdata); platform_set_drvdata(pdev, pdata);
pdata->hwmon_dev = hwmon_device_register(&pdev->dev); pdata->hwmon_dev = hwmon_device_register(dev);
if (IS_ERR(pdata->hwmon_dev)) { if (IS_ERR(pdata->hwmon_dev)) {
err = PTR_ERR(pdata->hwmon_dev); err = PTR_ERR(pdata->hwmon_dev);
dev_err(&pdev->dev, "Class registration failed (%d)\n", err); dev_err(&pdev->dev, "Class registration failed (%d)\n", err);
@ -607,8 +608,6 @@ static int coretemp_probe(struct platform_device *pdev)
exit_name: exit_name:
device_remove_file(&pdev->dev, &pdata->name_attr); device_remove_file(&pdev->dev, &pdata->name_attr);
exit_free:
kfree(pdata);
return err; return err;
} }
@ -623,7 +622,6 @@ static int coretemp_remove(struct platform_device *pdev)
device_remove_file(&pdev->dev, &pdata->name_attr); device_remove_file(&pdev->dev, &pdata->name_attr);
hwmon_device_unregister(pdata->hwmon_dev); hwmon_device_unregister(pdata->hwmon_dev);
kfree(pdata);
return 0; return 0;
} }