Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 22:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

hwmon: (pc87427) Convert to use devm_ functions

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

Cc: Jean Delvare <khali@linux-fr.org>
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:20:20 -07:00
parent 3fafb0ce92
commit 5e0c876920
1 changed files with 12 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/hwmon/pc87427.c
View File

@ -956,44 +956,28 @@ static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
* Device detection, attach and detach * Device detection, attach and detach
*/ */
static void pc87427_release_regions(struct platform_device *pdev, int count) static int __devinit pc87427_request_regions(struct platform_device *pdev,
int count)
{ {
struct resource *res; struct resource *res;
int i; int i;
for (i = 0; i < count; i++) {
res = platform_get_resource(pdev, IORESOURCE_IO, i);
release_region(res->start, resource_size(res));
}
}
static int __devinit pc87427_request_regions(struct platform_device *pdev,
int count)
{
struct resource *res;
int i, err = 0;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
res = platform_get_resource(pdev, IORESOURCE_IO, i); res = platform_get_resource(pdev, IORESOURCE_IO, i);
if (!res) { if (!res) {
err = -ENOENT;
dev_err(&pdev->dev, "Missing resource #%d\n", i); dev_err(&pdev->dev, "Missing resource #%d\n", i);
break; return -ENOENT;
} }
if (!request_region(res->start, resource_size(res), DRVNAME)) { if (!devm_request_region(&pdev->dev, res->start,
err = -EBUSY; resource_size(res), DRVNAME)) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Failed to request region 0x%lx-0x%lx\n", "Failed to request region 0x%lx-0x%lx\n",
(unsigned long)res->start, (unsigned long)res->start,
(unsigned long)res->end); (unsigned long)res->end);
break; return -EBUSY;
} }
} }
return 0;
if (err && i)
pc87427_release_regions(pdev, i);
return err;
} }
static void __devinit pc87427_init_device(struct device *dev) static void __devinit pc87427_init_device(struct device *dev)
@ -1094,11 +1078,11 @@ static int __devinit pc87427_probe(struct platform_device *pdev)
struct pc87427_data *data; struct pc87427_data *data;
int i, err, res_count; int i, err, res_count;
data = kzalloc(sizeof(struct pc87427_data), GFP_KERNEL); data = devm_kzalloc(&pdev->dev, sizeof(struct pc87427_data),
GFP_KERNEL);
if (!data) { if (!data) {
err = -ENOMEM;
pr_err("Out of memory\n"); pr_err("Out of memory\n");
goto exit; return -ENOMEM;
} }
data->address[0] = sio_data->address[0]; data->address[0] = sio_data->address[0];
@ -1107,7 +1091,7 @@ static int __devinit pc87427_probe(struct platform_device *pdev)
err = pc87427_request_regions(pdev, res_count); err = pc87427_request_regions(pdev, res_count);
if (err) if (err)
goto exit_kfree; return err;
mutex_init(&data->lock); mutex_init(&data->lock);
data->name = "pc87427"; data->name = "pc87427";
@ -1117,7 +1101,7 @@ static int __devinit pc87427_probe(struct platform_device *pdev)
/* Register sysfs hooks */ /* Register sysfs hooks */
err = device_create_file(&pdev->dev, &dev_attr_name); err = device_create_file(&pdev->dev, &dev_attr_name);
if (err) if (err)
goto exit_release_region; return err;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (!(data->fan_enabled & (1 << i))) if (!(data->fan_enabled & (1 << i)))
continue; continue;
@ -1154,28 +1138,15 @@ static int __devinit pc87427_probe(struct platform_device *pdev)
exit_remove_files: exit_remove_files:
pc87427_remove_files(&pdev->dev); pc87427_remove_files(&pdev->dev);
exit_release_region:
pc87427_release_regions(pdev, res_count);
exit_kfree:
platform_set_drvdata(pdev, NULL);
kfree(data);
exit:
return err; return err;
} }
static int __devexit pc87427_remove(struct platform_device *pdev) static int __devexit pc87427_remove(struct platform_device *pdev)
{ {
struct pc87427_data *data = platform_get_drvdata(pdev); struct pc87427_data *data = platform_get_drvdata(pdev);
int res_count;
res_count = (data->address[0] != 0) + (data->address[1] != 0);
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
pc87427_remove_files(&pdev->dev); pc87427_remove_files(&pdev->dev);
platform_set_drvdata(pdev, NULL);
kfree(data);
pc87427_release_regions(pdev, res_count);
return 0; return 0;
} }