Skip to content

Commit 482ca73

Browse files
Uwe Kleine-Königalexandrebelloni
authored andcommitted
rtc: imxdi: 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 48bc883 commit 482ca73

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/rtc/rtc-imxdi.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ static int __init dryice_rtc_probe(struct platform_device *pdev)
830830
return rc;
831831
}
832832

833-
static int __exit dryice_rtc_remove(struct platform_device *pdev)
833+
static void __exit dryice_rtc_remove(struct platform_device *pdev)
834834
{
835835
struct imxdi_dev *imxdi = platform_get_drvdata(pdev);
836836

@@ -840,8 +840,6 @@ static int __exit dryice_rtc_remove(struct platform_device *pdev)
840840
writel(0, imxdi->ioaddr + DIER);
841841

842842
clk_disable_unprepare(imxdi->clk);
843-
844-
return 0;
845843
}
846844

847845
static const struct of_device_id dryice_dt_ids[] = {
@@ -862,7 +860,7 @@ static struct platform_driver dryice_rtc_driver __refdata = {
862860
.name = "imxdi_rtc",
863861
.of_match_table = dryice_dt_ids,
864862
},
865-
.remove = __exit_p(dryice_rtc_remove),
863+
.remove_new = __exit_p(dryice_rtc_remove),
866864
};
867865

868866
module_platform_driver_probe(dryice_rtc_driver, dryice_rtc_probe);

0 commit comments

Comments
 (0)