Skip to content

Commit 801549e

Browse files
Uwe Kleine-KönigIngo Molnar
authored andcommitted
x86/platform/olpc-xo1-sci: 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 <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/63c9d1e6b07296916e4218c63f59a2dd6c6b6b16.1712732665.git.u.kleine-koenig@pengutronix.de
1 parent c741ccf commit 801549e

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

arch/x86/platform/olpc/olpc-xo1-sci.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ static int xo1_sci_probe(struct platform_device *pdev)
598598
return r;
599599
}
600600

601-
static int xo1_sci_remove(struct platform_device *pdev)
601+
static void xo1_sci_remove(struct platform_device *pdev)
602602
{
603603
free_irq(sci_irq, pdev);
604604
cancel_work_sync(&sci_work);
@@ -608,7 +608,6 @@ static int xo1_sci_remove(struct platform_device *pdev)
608608
free_ebook_switch();
609609
free_power_button();
610610
acpi_base = 0;
611-
return 0;
612611
}
613612

614613
static struct platform_driver xo1_sci_driver = {
@@ -617,7 +616,7 @@ static struct platform_driver xo1_sci_driver = {
617616
.dev_groups = lid_groups,
618617
},
619618
.probe = xo1_sci_probe,
620-
.remove = xo1_sci_remove,
619+
.remove_new = xo1_sci_remove,
621620
.suspend = xo1_sci_suspend,
622621
.resume = xo1_sci_resume,
623622
};

0 commit comments

Comments
 (0)