Skip to content

Commit f287083

Browse files
Uwe Kleine-Königrafaeljw
authored andcommitted
thermal: int3402: 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> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 8cc0991 commit f287083

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/thermal/intel/int340x_thermal/int3402_thermal.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,13 @@ static int int3402_thermal_probe(struct platform_device *pdev)
7171
return 0;
7272
}
7373

74-
static int int3402_thermal_remove(struct platform_device *pdev)
74+
static void int3402_thermal_remove(struct platform_device *pdev)
7575
{
7676
struct int3402_thermal_data *d = platform_get_drvdata(pdev);
7777

7878
acpi_remove_notify_handler(d->handle,
7979
ACPI_DEVICE_NOTIFY, int3402_notify);
8080
int340x_thermal_zone_remove(d->int340x_zone);
81-
82-
return 0;
8381
}
8482

8583
static const struct acpi_device_id int3402_thermal_match[] = {
@@ -91,7 +89,7 @@ MODULE_DEVICE_TABLE(acpi, int3402_thermal_match);
9189

9290
static struct platform_driver int3402_thermal_driver = {
9391
.probe = int3402_thermal_probe,
94-
.remove = int3402_thermal_remove,
92+
.remove_new = int3402_thermal_remove,
9593
.driver = {
9694
.name = "int3402 thermal",
9795
.acpi_match_table = int3402_thermal_match,

0 commit comments

Comments
 (0)