Skip to content

Commit 2570108

Browse files
Uwe Kleine-Königrafaeljw
authored andcommitted
thermal: int3403: 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 f287083 commit 2570108

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/thermal/intel/int340x_thermal/int3403_thermal.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ static int int3403_add(struct platform_device *pdev)
262262
return result;
263263
}
264264

265-
static int int3403_remove(struct platform_device *pdev)
265+
static void int3403_remove(struct platform_device *pdev)
266266
{
267267
struct int3403_priv *priv = platform_get_drvdata(pdev);
268268

@@ -277,8 +277,6 @@ static int int3403_remove(struct platform_device *pdev)
277277
default:
278278
break;
279279
}
280-
281-
return 0;
282280
}
283281

284282
static const struct acpi_device_id int3403_device_ids[] = {
@@ -293,7 +291,7 @@ MODULE_DEVICE_TABLE(acpi, int3403_device_ids);
293291

294292
static struct platform_driver int3403_driver = {
295293
.probe = int3403_add,
296-
.remove = int3403_remove,
294+
.remove_new = int3403_remove,
297295
.driver = {
298296
.name = "int3403 thermal",
299297
.acpi_match_table = int3403_device_ids,

0 commit comments

Comments
 (0)