Skip to content

Commit 48bc883

Browse files
Uwe Kleine-Königalexandrebelloni
authored andcommitted
rtc: at91rm9200: 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 94a2da3 commit 48bc883

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/rtc/rtc-at91rm9200.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -558,16 +558,14 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
558558
/*
559559
* Disable and remove the RTC driver
560560
*/
561-
static int __exit at91_rtc_remove(struct platform_device *pdev)
561+
static void at91_rtc_remove(struct platform_device *pdev)
562562
{
563563
/* Disable all interrupts */
564564
at91_rtc_write_idr(AT91_RTC_ACKUPD | AT91_RTC_ALARM |
565565
AT91_RTC_SECEV | AT91_RTC_TIMEV |
566566
AT91_RTC_CALEV);
567567

568568
clk_disable_unprepare(sclk);
569-
570-
return 0;
571569
}
572570

573571
static void at91_rtc_shutdown(struct platform_device *pdev)
@@ -642,7 +640,7 @@ static SIMPLE_DEV_PM_OPS(at91_rtc_pm_ops, at91_rtc_suspend, at91_rtc_resume);
642640
* triggering a section mismatch warning.
643641
*/
644642
static struct platform_driver at91_rtc_driver __refdata = {
645-
.remove = __exit_p(at91_rtc_remove),
643+
.remove_new = __exit_p(at91_rtc_remove),
646644
.shutdown = at91_rtc_shutdown,
647645
.driver = {
648646
.name = "at91_rtc",

0 commit comments

Comments
 (0)