a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwmon: (via686a) Convert to use devm_ functions

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

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 f625e0fd51
commit fd55bc009a
1 changed files with 7 additions and 16 deletions

21
drivers/hwmon/via686a.c
View File

@ -690,18 +690,17 @@ static int __devinit via686a_probe(struct platform_device *pdev)
/* Reserve the ISA region */ /* Reserve the ISA region */
res = platform_get_resource(pdev, IORESOURCE_IO, 0); res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (!request_region(res->start, VIA686A_EXTENT, if (!devm_request_region(&pdev->dev, res->start, VIA686A_EXTENT,
via686a_driver.driver.name)) { via686a_driver.driver.name)) {
dev_err(&pdev->dev, "Region 0x%lx-0x%lx already in use!\n", dev_err(&pdev->dev, "Region 0x%lx-0x%lx already in use!\n",
(unsigned long)res->start, (unsigned long)res->end); (unsigned long)res->start, (unsigned long)res->end);
return -ENODEV; return -ENODEV;
} }
data = kzalloc(sizeof(struct via686a_data), GFP_KERNEL); data = devm_kzalloc(&pdev->dev, sizeof(struct via686a_data),
if (!data) { GFP_KERNEL);
err = -ENOMEM; if (!data)
goto exit_release; return -ENOMEM;
}
platform_set_drvdata(pdev, data); platform_set_drvdata(pdev, data);
data->addr = res->start; data->addr = res->start;
@ -714,7 +713,7 @@ static int __devinit via686a_probe(struct platform_device *pdev)
/* Register sysfs hooks */ /* Register sysfs hooks */
err = sysfs_create_group(&pdev->dev.kobj, &via686a_group); err = sysfs_create_group(&pdev->dev.kobj, &via686a_group);
if (err) if (err)
goto exit_free; return err;
data->hwmon_dev = hwmon_device_register(&pdev->dev); data->hwmon_dev = hwmon_device_register(&pdev->dev);
if (IS_ERR(data->hwmon_dev)) { if (IS_ERR(data->hwmon_dev)) {
@ -726,10 +725,6 @@ static int __devinit via686a_probe(struct platform_device *pdev)
exit_remove_files: exit_remove_files:
sysfs_remove_group(&pdev->dev.kobj, &via686a_group); sysfs_remove_group(&pdev->dev.kobj, &via686a_group);
exit_free:
kfree(data);
exit_release:
release_region(res->start, VIA686A_EXTENT);
return err; return err;
} }
@ -740,10 +735,6 @@ static int __devexit via686a_remove(struct platform_device *pdev)
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&pdev->dev.kobj, &via686a_group); sysfs_remove_group(&pdev->dev.kobj, &via686a_group);
release_region(data->addr, VIA686A_EXTENT);
platform_set_drvdata(pdev, NULL);
kfree(data);
return 0; return 0;
} }