Skip to content

Commit fff118c

Browse files
Uwe Kleine-Königalexandrebelloni
authored andcommitted
rtc: twl: 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 (mostly) ignored 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. 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> Link: https://lore.kernel.org/r/20230304133028.2135435-38-u.kleine-koenig@pengutronix.de Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent adebcc1 commit fff118c

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/rtc/rtc-twl.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ static int twl_rtc_probe(struct platform_device *pdev)
586586
* Disable all TWL RTC module interrupts.
587587
* Sets status flag to free.
588588
*/
589-
static int twl_rtc_remove(struct platform_device *pdev)
589+
static void twl_rtc_remove(struct platform_device *pdev)
590590
{
591591
struct twl_rtc *twl_rtc = platform_get_drvdata(pdev);
592592

@@ -599,8 +599,6 @@ static int twl_rtc_remove(struct platform_device *pdev)
599599
twl6030_interrupt_mask(TWL6030_RTC_INT_MASK,
600600
REG_INT_MSK_STS_A);
601601
}
602-
603-
return 0;
604602
}
605603

606604
static void twl_rtc_shutdown(struct platform_device *pdev)
@@ -642,7 +640,7 @@ MODULE_DEVICE_TABLE(of, twl_rtc_of_match);
642640

643641
static struct platform_driver twl4030rtc_driver = {
644642
.probe = twl_rtc_probe,
645-
.remove = twl_rtc_remove,
643+
.remove_new = twl_rtc_remove,
646644
.shutdown = twl_rtc_shutdown,
647645
.driver = {
648646
.name = "twl_rtc",

0 commit comments

Comments
 (0)