Skip to content

Commit b8e346b

Browse files
Uwe Kleine-KönigJassiBrar
authored andcommitted
mailbox: sun6i-msgbox: 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 <u.kleine-koenig@pengutronix.de> Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
1 parent 0a902f5 commit b8e346b

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/mailbox/sun6i-msgbox.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,15 +287,13 @@ static int sun6i_msgbox_probe(struct platform_device *pdev)
287287
return ret;
288288
}
289289

290-
static int sun6i_msgbox_remove(struct platform_device *pdev)
290+
static void sun6i_msgbox_remove(struct platform_device *pdev)
291291
{
292292
struct sun6i_msgbox *mbox = platform_get_drvdata(pdev);
293293

294294
mbox_controller_unregister(&mbox->controller);
295295
/* See the comment in sun6i_msgbox_probe about the reset line. */
296296
clk_disable_unprepare(mbox->clk);
297-
298-
return 0;
299297
}
300298

301299
static const struct of_device_id sun6i_msgbox_of_match[] = {
@@ -310,7 +308,7 @@ static struct platform_driver sun6i_msgbox_driver = {
310308
.of_match_table = sun6i_msgbox_of_match,
311309
},
312310
.probe = sun6i_msgbox_probe,
313-
.remove = sun6i_msgbox_remove,
311+
.remove_new = sun6i_msgbox_remove,
314312
};
315313
module_platform_driver(sun6i_msgbox_driver);
316314

0 commit comments

Comments
 (0)