Message ID | 20220603210758.148493-4-u.kleine-koenig@pengutronix.de |
---|---|
State | Accepted |
Headers | show |
Series | mtd: Fix platform remove callbacks to always return 0 | expand |
On Fri, 2022-06-03 at 21:07:47 UTC, =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= wrote: > mtd_device_unregister() shouldn't fail. Wail loudly if it does anyhow. > > This matches how other drivers (e.g. nand/raw/nandsim.c) use > mtd_device_unregister(). > > By returning 0 in the platform remove callback a generic error message > by the device core is suppressed, nothing else changes. > > This is a preparation for making platform remove callbacks return void. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks. Miquel
diff --git a/drivers/mtd/devices/powernv_flash.c b/drivers/mtd/devices/powernv_flash.c index 6950a8764815..36e060386e59 100644 --- a/drivers/mtd/devices/powernv_flash.c +++ b/drivers/mtd/devices/powernv_flash.c @@ -270,7 +270,9 @@ static int powernv_flash_release(struct platform_device *pdev) struct powernv_flash *data = dev_get_drvdata(&(pdev->dev)); /* All resources should be freed automatically */ - return mtd_device_unregister(&(data->mtd)); + WARN_ON(mtd_device_unregister(&data->mtd)); + + return 0; } static const struct of_device_id powernv_flash_match[] = {
mtd_device_unregister() shouldn't fail. Wail loudly if it does anyhow. This matches how other drivers (e.g. nand/raw/nandsim.c) use mtd_device_unregister(). By returning 0 in the platform remove callback a generic error message by the device core is suppressed, nothing else changes. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/mtd/devices/powernv_flash.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)