qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ACPI: fan: Convert to platform remove callback returning void 

JIRA: https://issues.redhat.com/browse/RHEL-54149

commit 24fd13c0824f1fc3cb2db0f96d8ac78302b5beb7
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Tue, 27 Feb 2024 15:57:34 +0000

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>
Signed-off-by: Mark Langsdorf <mlangsdo@redhat.com>
This commit is contained in:
Mark Langsdorf 2024-08-13 14:46:34 -04:00
parent 7e2bd0b703
commit 3f99822012
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/acpi/fan_core.c
View File

@ -387,7 +387,7 @@ err_end:
return result; return result;
} }
static int acpi_fan_remove(struct platform_device *pdev) static void acpi_fan_remove(struct platform_device *pdev)
{ {
struct acpi_fan *fan = platform_get_drvdata(pdev); struct acpi_fan *fan = platform_get_drvdata(pdev);
@ -399,8 +399,6 @@ static int acpi_fan_remove(struct platform_device *pdev)
sysfs_remove_link(&pdev->dev.kobj, "thermal_cooling"); sysfs_remove_link(&pdev->dev.kobj, "thermal_cooling");
sysfs_remove_link(&fan->cdev->device.kobj, "device"); sysfs_remove_link(&fan->cdev->device.kobj, "device");
thermal_cooling_device_unregister(fan->cdev); thermal_cooling_device_unregister(fan->cdev);
return 0;
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
@ -446,7 +444,7 @@ static const struct dev_pm_ops acpi_fan_pm = {
static struct platform_driver acpi_fan_driver = { static struct platform_driver acpi_fan_driver = {
.probe = acpi_fan_probe, .probe = acpi_fan_probe,
.remove = acpi_fan_remove, .remove_new = acpi_fan_remove,
.driver = { .driver = {
.name = "acpi-fan", .name = "acpi-fan",
.acpi_match_table = fan_device_ids, .acpi_match_table = fan_device_ids,