Skip to content

Commit bf562bc

Browse files
Uwe Kleine-KönigJassiBrar
authored andcommitted
mailbox: mailbox-test: 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> Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
1 parent a0c313d commit bf562bc

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/mailbox/mailbox-test.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ static int mbox_test_probe(struct platform_device *pdev)
418418
return 0;
419419
}
420420

421-
static int mbox_test_remove(struct platform_device *pdev)
421+
static void mbox_test_remove(struct platform_device *pdev)
422422
{
423423
struct mbox_test_device *tdev = platform_get_drvdata(pdev);
424424

@@ -428,8 +428,6 @@ static int mbox_test_remove(struct platform_device *pdev)
428428
mbox_free_channel(tdev->tx_channel);
429429
if (tdev->rx_channel)
430430
mbox_free_channel(tdev->rx_channel);
431-
432-
return 0;
433431
}
434432

435433
static const struct of_device_id mbox_test_match[] = {
@@ -444,7 +442,7 @@ static struct platform_driver mbox_test_driver = {
444442
.of_match_table = mbox_test_match,
445443
},
446444
.probe = mbox_test_probe,
447-
.remove = mbox_test_remove,
445+
.remove_new = mbox_test_remove,
448446
};
449447
module_platform_driver(mbox_test_driver);
450448

0 commit comments

Comments
 (0)