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

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>

diff --git a/drivers/hwmon/s3c-hwmon.c b/drivers/hwmon/s3c-hwmon.c
index f6c26d19f521aaa98dd2b0596d67ab27028b8d15..b7975f858cffd098f93a0fd585b78761540c497c 100644 (file)
--- a/drivers/hwmon/s3c-hwmon.c
+++ b/drivers/hwmon/s3c-hwmon.c
@@ -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;
@@ -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. */
@@ -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;
 }