android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwmon: (vt1211) Convert to use devm_ functions

Browse Source 
Convert to use devm_ functions to reduce code size and simplify the code.

Cc: Juerg Haefliger <juergh@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
Guenter Roeck 2012-06-02 11:35:54 -07:00
parent fd55bc009a
commit 84269edce7
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/hwmon/vt1211.c
View File

@ -1148,19 +1148,18 @@ static int __devinit vt1211_probe(struct platform_device *pdev)
struct resource *res; struct resource *res;
int i, err; int i, err;
data = kzalloc(sizeof(struct vt1211_data), GFP_KERNEL); data = devm_kzalloc(dev, sizeof(struct vt1211_data), GFP_KERNEL);
if (!data) { if (!data) {
err = -ENOMEM;
dev_err(dev, "Out of memory\n"); dev_err(dev, "Out of memory\n");
goto EXIT; return -ENOMEM;
} }
res = platform_get_resource(pdev, IORESOURCE_IO, 0); res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (!request_region(res->start, resource_size(res), DRVNAME)) { if (!devm_request_region(dev, res->start, resource_size(res),
err = -EBUSY; DRVNAME)) {
dev_err(dev, "Failed to request region 0x%lx-0x%lx\n", dev_err(dev, "Failed to request region 0x%lx-0x%lx\n",
(unsigned long)res->start, (unsigned long)res->end); (unsigned long)res->start, (unsigned long)res->end);
goto EXIT_KFREE; return -EBUSY;
} }
data->addr = res->start; data->addr = res->start;
data->name = DRVNAME; data->name = DRVNAME;
@ -1215,26 +1214,15 @@ static int __devinit vt1211_probe(struct platform_device *pdev)
dev_err(dev, "Sysfs interface creation failed (%d)\n", err); dev_err(dev, "Sysfs interface creation failed (%d)\n", err);
EXIT_DEV_REMOVE_SILENT: EXIT_DEV_REMOVE_SILENT:
vt1211_remove_sysfs(pdev); vt1211_remove_sysfs(pdev);
release_region(res->start, resource_size(res));
EXIT_KFREE:
platform_set_drvdata(pdev, NULL);
kfree(data);
EXIT:
return err; return err;
} }
static int __devexit vt1211_remove(struct platform_device *pdev) static int __devexit vt1211_remove(struct platform_device *pdev)
{ {
struct vt1211_data *data = platform_get_drvdata(pdev); struct vt1211_data *data = platform_get_drvdata(pdev);
struct resource *res;
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
vt1211_remove_sysfs(pdev); vt1211_remove_sysfs(pdev);
platform_set_drvdata(pdev, NULL);
kfree(data);
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
release_region(res->start, resource_size(res));
return 0; return 0;
} }