Skip to content

Commit f4d571b

Browse files
Uwe Kleine-Königalexandrebelloni
authored andcommitted
rtc: sh: 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]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexandre Belloni <[email protected]>
1 parent e288cfe commit f4d571b

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/rtc/rtc-sh.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -620,16 +620,14 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
620620
return ret;
621621
}
622622

623-
static int __exit sh_rtc_remove(struct platform_device *pdev)
623+
static void __exit sh_rtc_remove(struct platform_device *pdev)
624624
{
625625
struct sh_rtc *rtc = platform_get_drvdata(pdev);
626626

627627
sh_rtc_setaie(&pdev->dev, 0);
628628
sh_rtc_setcie(&pdev->dev, 0);
629629

630630
clk_disable(rtc->clk);
631-
632-
return 0;
633631
}
634632

635633
static void sh_rtc_set_irq_wake(struct device *dev, int enabled)
@@ -680,7 +678,7 @@ static struct platform_driver sh_rtc_platform_driver __refdata = {
680678
.pm = &sh_rtc_pm_ops,
681679
.of_match_table = sh_rtc_of_match,
682680
},
683-
.remove = __exit_p(sh_rtc_remove),
681+
.remove_new = __exit_p(sh_rtc_remove),
684682
};
685683

686684
module_platform_driver_probe(sh_rtc_platform_driver, sh_rtc_probe);

0 commit comments

Comments
 (0)