Message ID | 20211108093153.63792-1-u.kleine-koenig@pengutronix.de (mailing list archive) |
---|---|
State | Accepted |
Commit | 4fea96afff3037ae8b353f08457b3e006ad8f875 |
Headers | show |
Series | [1/4] mtd: dataflash: Warn about failure to unregister mtd device | expand |
On Mon, 2021-11-08 at 09:31:49 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 spi remove callback a generic error message by the > spi framework (and nothing else) is suppressed. > > 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/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 9802e265fca8..293cab758299 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -912,14 +912,14 @@ static int dataflash_probe(struct spi_device *spi) static int dataflash_remove(struct spi_device *spi) { struct dataflash *flash = spi_get_drvdata(spi); - int status; dev_dbg(&spi->dev, "remove\n"); - status = mtd_device_unregister(&flash->mtd); - if (status == 0) - kfree(flash); - return status; + WARN_ON(mtd_device_unregister(&flash->mtd)); + + kfree(flash); + + return 0; } static struct spi_driver dataflash_driver = {
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 spi remove callback a generic error message by the spi framework (and nothing else) is suppressed. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/mtd/devices/mtd_dataflash.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) base-commit: 6b75d88fa81b122cce37ebf17428a849ccd3d0f1