Skip to content

Commit 9e6a2ad

Browse files
Uwe Kleine-Königalexandrebelloni
authored andcommitted
rtc: s3c: 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-30-u.kleine-koenig@pengutronix.de Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent e55fbc8 commit 9e6a2ad

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/rtc/rtc-s3c.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ static void s3c6410_rtc_disable(struct s3c_rtc *info)
385385
writew(con, info->base + S3C2410_RTCCON);
386386
}
387387

388-
static int s3c_rtc_remove(struct platform_device *pdev)
388+
static void s3c_rtc_remove(struct platform_device *pdev)
389389
{
390390
struct s3c_rtc *info = platform_get_drvdata(pdev);
391391

@@ -394,8 +394,6 @@ static int s3c_rtc_remove(struct platform_device *pdev)
394394
if (info->data->needs_src_clk)
395395
clk_unprepare(info->rtc_src_clk);
396396
clk_unprepare(info->rtc_clk);
397-
398-
return 0;
399397
}
400398

401399
static int s3c_rtc_probe(struct platform_device *pdev)
@@ -600,7 +598,7 @@ MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match);
600598

601599
static struct platform_driver s3c_rtc_driver = {
602600
.probe = s3c_rtc_probe,
603-
.remove = s3c_rtc_remove,
601+
.remove_new = s3c_rtc_remove,
604602
.driver = {
605603
.name = "s3c-rtc",
606604
.pm = &s3c_rtc_pm_ops,

0 commit comments

Comments
 (0)