Skip to content

Commit f45e5cf

Browse files
Uwe Kleine-Königalexandrebelloni
authored andcommitted
rtc: zynqmp: 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-42-u.kleine-koenig@pengutronix.de Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent 257062d commit f45e5cf

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/rtc/rtc-zynqmp.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,10 @@ static int xlnx_rtc_probe(struct platform_device *pdev)
342342
return devm_rtc_register_device(xrtcdev->rtc);
343343
}
344344

345-
static int xlnx_rtc_remove(struct platform_device *pdev)
345+
static void xlnx_rtc_remove(struct platform_device *pdev)
346346
{
347347
xlnx_rtc_alarm_irq_enable(&pdev->dev, 0);
348348
device_init_wakeup(&pdev->dev, 0);
349-
350-
return 0;
351349
}
352350

353351
static int __maybe_unused xlnx_rtc_suspend(struct device *dev)
@@ -384,7 +382,7 @@ MODULE_DEVICE_TABLE(of, xlnx_rtc_of_match);
384382

385383
static struct platform_driver xlnx_rtc_driver = {
386384
.probe = xlnx_rtc_probe,
387-
.remove = xlnx_rtc_remove,
385+
.remove_new = xlnx_rtc_remove,
388386
.driver = {
389387
.name = KBUILD_MODNAME,
390388
.pm = &xlnx_rtc_pm_ops,

0 commit comments

Comments
 (0)