Skip to content

Commit

Permalink
hwmon: (ntc_thermistor) Convert to devm_kzalloc
Browse files Browse the repository at this point in the history
This avoids memory leaks, and makes the code a bit simpler and smaller.

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>
  • Loading branch information
Guenter Roeck committed May 21, 2012
1 parent 1137a9a commit 41141e6
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/hwmon/ntc_thermistor.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ static int __devinit ntc_thermistor_probe(struct platform_device *pdev)
return -EINVAL;
}

data = kzalloc(sizeof(struct ntc_data), GFP_KERNEL);
data = devm_kzalloc(&pdev->dev, sizeof(struct ntc_data), GFP_KERNEL);
if (!data)
return -ENOMEM;

Expand All @@ -370,16 +370,15 @@ static int __devinit ntc_thermistor_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Unknown device type: %lu(%s)\n",
pdev->id_entry->driver_data,
pdev->id_entry->name);
ret = -EINVAL;
goto err;
return -EINVAL;
}

platform_set_drvdata(pdev, data);

ret = sysfs_create_group(&data->dev->kobj, &ntc_attr_group);
if (ret) {
dev_err(data->dev, "unable to create sysfs files\n");
goto err;
return ret;
}

data->hwmon_dev = hwmon_device_register(data->dev);
Expand All @@ -395,8 +394,6 @@ static int __devinit ntc_thermistor_probe(struct platform_device *pdev)
return 0;
err_after_sysfs:
sysfs_remove_group(&data->dev->kobj, &ntc_attr_group);
err:
kfree(data);
return ret;
}

Expand All @@ -408,8 +405,6 @@ static int __devexit ntc_thermistor_remove(struct platform_device *pdev)
sysfs_remove_group(&data->dev->kobj, &ntc_attr_group);
platform_set_drvdata(pdev, NULL);

kfree(data);

return 0;
}

Expand Down

0 comments on commit 41141e6

Please sign in to comment.