Skip to content

Commit ede66fb

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

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/rtc/rtc-mv.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ static int __init mv_rtc_probe(struct platform_device *pdev)
282282
return ret;
283283
}
284284

285-
static int __exit mv_rtc_remove(struct platform_device *pdev)
285+
static void __exit mv_rtc_remove(struct platform_device *pdev)
286286
{
287287
struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
288288

@@ -291,8 +291,6 @@ static int __exit mv_rtc_remove(struct platform_device *pdev)
291291

292292
if (!IS_ERR(pdata->clk))
293293
clk_disable_unprepare(pdata->clk);
294-
295-
return 0;
296294
}
297295

298296
#ifdef CONFIG_OF
@@ -310,7 +308,7 @@ MODULE_DEVICE_TABLE(of, rtc_mv_of_match_table);
310308
* triggering a section mismatch warning.
311309
*/
312310
static struct platform_driver mv_rtc_driver __refdata = {
313-
.remove = __exit_p(mv_rtc_remove),
311+
.remove_new = __exit_p(mv_rtc_remove),
314312
.driver = {
315313
.name = "rtc-mv",
316314
.of_match_table = of_match_ptr(rtc_mv_of_match_table),

0 commit comments

Comments
 (0)