Skip to content

Commit

Permalink
hwmon: (vt8231) Convert to use devm_ functions
Browse files Browse the repository at this point in the history
Convert to use devm_ functions to reduce code size and simplify the code.

Cc: Roger Lucas <vt8231@hiddenengine.co.uk>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
  • Loading branch information
Guenter Roeck committed Sep 24, 2012
1 parent a844af1 commit 7711f1b
Showing 1 changed file with 6 additions and 18 deletions.
24 changes: 6 additions & 18 deletions drivers/hwmon/vt8231.c
Original file line number Diff line number Diff line change
Expand Up @@ -789,18 +789,16 @@ static int vt8231_probe(struct platform_device *pdev)

/* Reserve the ISA region */
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (!request_region(res->start, VT8231_EXTENT,
vt8231_driver.driver.name)) {
if (!devm_request_region(&pdev->dev, res->start, VT8231_EXTENT,
vt8231_driver.driver.name)) {
dev_err(&pdev->dev, "Region 0x%lx-0x%lx already in use!\n",
(unsigned long)res->start, (unsigned long)res->end);
return -ENODEV;
}

data = kzalloc(sizeof(struct vt8231_data), GFP_KERNEL);
if (!data) {
err = -ENOMEM;
goto exit_release;
}
data = devm_kzalloc(&pdev->dev, sizeof(struct vt8231_data), GFP_KERNEL);
if (!data)
return -ENOMEM;

platform_set_drvdata(pdev, data);
data->addr = res->start;
Expand All @@ -812,7 +810,7 @@ static int vt8231_probe(struct platform_device *pdev)
/* Register sysfs hooks */
err = sysfs_create_group(&pdev->dev.kobj, &vt8231_group);
if (err)
goto exit_free;
return err;

/* Must update device information to find out the config field */
data->uch_config = vt8231_read_value(data, VT8231_REG_UCH_CONFIG);
Expand Down Expand Up @@ -850,13 +848,6 @@ static int vt8231_probe(struct platform_device *pdev)
sysfs_remove_group(&pdev->dev.kobj, &vt8231_group_temps[i]);

sysfs_remove_group(&pdev->dev.kobj, &vt8231_group);

exit_free:
platform_set_drvdata(pdev, NULL);
kfree(data);

exit_release:
release_region(res->start, VT8231_EXTENT);
return err;
}

Expand All @@ -875,9 +866,6 @@ static int __devexit vt8231_remove(struct platform_device *pdev)

sysfs_remove_group(&pdev->dev.kobj, &vt8231_group);

release_region(data->addr, VT8231_EXTENT);
platform_set_drvdata(pdev, NULL);
kfree(data);
return 0;
}

Expand Down

0 comments on commit 7711f1b

Please sign in to comment.