luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwmon: (s3c-hwmon) Use devm_kzalloc instead of kzalloc

Browse Source 
This makes the code simpler as explicit freeing is not needed.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Sachin Kamat 2012-07-13 14:36:28 +05:30 committed by Guenter Roeck
parent bbc8a569ae
commit 41bf870e6d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/hwmon/s3c-hwmon.c
View File

@ -288,7 +288,7 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev)
return -EINVAL; return -EINVAL;
} }
hwmon = kzalloc(sizeof(struct s3c_hwmon), GFP_KERNEL); hwmon = devm_kzalloc(&dev->dev, sizeof(struct s3c_hwmon), GFP_KERNEL);
if (hwmon == NULL) { if (hwmon == NULL) {
dev_err(&dev->dev, "no memory\n"); dev_err(&dev->dev, "no memory\n");
return -ENOMEM; return -ENOMEM;
@ -303,8 +303,7 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev)
hwmon->client = s3c_adc_register(dev, NULL, NULL, 0); hwmon->client = s3c_adc_register(dev, NULL, NULL, 0);
if (IS_ERR(hwmon->client)) { if (IS_ERR(hwmon->client)) {
dev_err(&dev->dev, "cannot register adc\n"); dev_err(&dev->dev, "cannot register adc\n");
ret = PTR_ERR(hwmon->client); return PTR_ERR(hwmon->client);
goto err_mem;
} }
/* add attributes for our adc devices. */ /* add attributes for our adc devices. */
@ -363,8 +362,6 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev)
err_registered: err_registered:
s3c_adc_release(hwmon->client); s3c_adc_release(hwmon->client);
err_mem:
kfree(hwmon);
return ret; return ret;
} }