Commit 228f2aed authored by Armin Wolf's avatar Armin Wolf Committed by Guenter Roeck

hwmon: (w83627ehf) Remove w83627ehf_remove()

Using devm_request_region() allows us to omit
w83627ehf_remove() and also simplifies error
handling during probe.
Also fixed a checkpatch issue.
Signed-off-by: default avatarArmin Wolf <W_Armin@gmx.de>
Link: https://lore.kernel.org/r/20210709184501.6546-3-W_Armin@gmx.deSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 964c1c91
...@@ -1705,20 +1705,12 @@ static int __init w83627ehf_probe(struct platform_device *pdev) ...@@ -1705,20 +1705,12 @@ static int __init w83627ehf_probe(struct platform_device *pdev)
struct device *hwmon_dev; struct device *hwmon_dev;
res = platform_get_resource(pdev, IORESOURCE_IO, 0); res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (!request_region(res->start, IOREGION_LENGTH, DRVNAME)) { if (!devm_request_region(dev, res->start, IOREGION_LENGTH, DRVNAME))
err = -EBUSY; return -EBUSY;
dev_err(dev, "Failed to request region 0x%lx-0x%lx\n",
(unsigned long)res->start,
(unsigned long)res->start + IOREGION_LENGTH - 1);
goto exit;
}
data = devm_kzalloc(&pdev->dev, sizeof(struct w83627ehf_data), data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
GFP_KERNEL); if (!data)
if (!data) { return -ENOMEM;
err = -ENOMEM;
goto exit_release;
}
data->addr = res->start; data->addr = res->start;
mutex_init(&data->lock); mutex_init(&data->lock);
...@@ -1882,7 +1874,7 @@ static int __init w83627ehf_probe(struct platform_device *pdev) ...@@ -1882,7 +1874,7 @@ static int __init w83627ehf_probe(struct platform_device *pdev)
err = superio_enter(sio_data->sioreg); err = superio_enter(sio_data->sioreg);
if (err) if (err)
goto exit_release; return err;
/* Read VID value */ /* Read VID value */
if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) { if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) {
...@@ -1951,26 +1943,7 @@ static int __init w83627ehf_probe(struct platform_device *pdev) ...@@ -1951,26 +1943,7 @@ static int __init w83627ehf_probe(struct platform_device *pdev)
data, data,
&w83627ehf_chip_info, &w83627ehf_chip_info,
w83627ehf_groups); w83627ehf_groups);
if (IS_ERR(hwmon_dev)) { return PTR_ERR_OR_ZERO(hwmon_dev);
err = PTR_ERR(hwmon_dev);
goto exit_release;
}
return 0;
exit_release:
release_region(res->start, IOREGION_LENGTH);
exit:
return err;
}
static int w83627ehf_remove(struct platform_device *pdev)
{
struct w83627ehf_data *data = platform_get_drvdata(pdev);
release_region(data->addr, IOREGION_LENGTH);
return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
...@@ -2057,7 +2030,6 @@ static struct platform_driver w83627ehf_driver = { ...@@ -2057,7 +2030,6 @@ static struct platform_driver w83627ehf_driver = {
.name = DRVNAME, .name = DRVNAME,
.pm = W83627EHF_DEV_PM_OPS, .pm = W83627EHF_DEV_PM_OPS,
}, },
.remove = w83627ehf_remove,
}; };
/* w83627ehf_find() looks for a '627 in the Super-I/O config space */ /* w83627ehf_find() looks for a '627 in the Super-I/O config space */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment