Skip to content

Commit

Permalink
hwmon: (s3c-hwmon) Use devm_kzalloc instead of kzalloc
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sachin Kamat authored and Guenter Roeck committed Jul 22, 2012
1 parent bbc8a56 commit 41bf870
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/hwmon/s3c-hwmon.c
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev)
return -EINVAL;
}

hwmon = kzalloc(sizeof(struct s3c_hwmon), GFP_KERNEL);
hwmon = devm_kzalloc(&dev->dev, sizeof(struct s3c_hwmon), GFP_KERNEL);
if (hwmon == NULL) {
dev_err(&dev->dev, "no memory\n");
return -ENOMEM;
Expand All @@ -303,8 +303,7 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev)
hwmon->client = s3c_adc_register(dev, NULL, NULL, 0);
if (IS_ERR(hwmon->client)) {
dev_err(&dev->dev, "cannot register adc\n");
ret = PTR_ERR(hwmon->client);
goto err_mem;
return PTR_ERR(hwmon->client);
}

/* add attributes for our adc devices. */
Expand Down Expand Up @@ -363,8 +362,6 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev)
err_registered:
s3c_adc_release(hwmon->client);

err_mem:
kfree(hwmon);
return ret;
}

Expand Down

0 comments on commit 41bf870

Please sign in to comment.