diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2012-07-13 14:36:28 +0530 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-07-21 21:48:45 -0700 |
| commit | 41bf870e6db130c6e467c70b6da96398066b8be7 (patch) | |
| tree | 86660ac853a2573678bd2ec909f9ac2cd6d72499 /drivers/hwmon | |
| parent | bbc8a569ae91e0951f4b7f8eb33ef1970bf2129c (diff) | |
| download | linux-41bf870e6db130c6e467c70b6da96398066b8be7.tar.gz linux-41bf870e6db130c6e467c70b6da96398066b8be7.tar.bz2 linux-41bf870e6db130c6e467c70b6da96398066b8be7.zip | |
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>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/s3c-hwmon.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/hwmon/s3c-hwmon.c b/drivers/hwmon/s3c-hwmon.c index f6c26d19f521..b7975f858cff 100644 --- 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; } |