Skip to content

Commit 24fd13c

Browse files
Uwe Kleine-Königrafaeljw
authored andcommitted
ACPI: fan: Convert to platform remove callback returning void
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent c21f50e commit 24fd13c

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/acpi/fan_core.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ static int acpi_fan_probe(struct platform_device *pdev)
387387
return result;
388388
}
389389

390-
static int acpi_fan_remove(struct platform_device *pdev)
390+
static void acpi_fan_remove(struct platform_device *pdev)
391391
{
392392
struct acpi_fan *fan = platform_get_drvdata(pdev);
393393

@@ -399,8 +399,6 @@ static int acpi_fan_remove(struct platform_device *pdev)
399399
sysfs_remove_link(&pdev->dev.kobj, "thermal_cooling");
400400
sysfs_remove_link(&fan->cdev->device.kobj, "device");
401401
thermal_cooling_device_unregister(fan->cdev);
402-
403-
return 0;
404402
}
405403

406404
#ifdef CONFIG_PM_SLEEP
@@ -446,7 +444,7 @@ static const struct dev_pm_ops acpi_fan_pm = {
446444

447445
static struct platform_driver acpi_fan_driver = {
448446
.probe = acpi_fan_probe,
449-
.remove = acpi_fan_remove,
447+
.remove_new = acpi_fan_remove,
450448
.driver = {
451449
.name = "acpi-fan",
452450
.acpi_match_table = fan_device_ids,

0 commit comments

Comments
 (0)