summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2020-05-19 14:59:34 +0200
committerMiquel Raynal <miquel.raynal@bootlin.com>2020-05-26 21:37:51 +0200
commit08f25cd767e1086266453fb2f4a3ded05b9cc8a7 (patch)
tree6a9d8e18138677cdd0a63b6ddcd7609aa8d6ed66
parent88ffef1b65cf989b2dfea6374caff804fca6ec32 (diff)
downloadlinux-08f25cd767e1086266453fb2f4a3ded05b9cc8a7.tar.bz2
mtd: rawnand: ams-delta: Stop using nand_release()
This helper is not very useful and very often people get confused: they use nand_release() instead of nand_cleanup(). Let's stop using nand_release() by calling mtd_device_unregister() and nand_cleanup() directly. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20200519130035.1883-2-miquel.raynal@bootlin.com
-rw-r--r--drivers/mtd/nand/raw/ams-delta.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/ams-delta.c b/drivers/mtd/nand/raw/ams-delta.c
index d66dab25df20..3711e7a0436c 100644
--- a/drivers/mtd/nand/raw/ams-delta.c
+++ b/drivers/mtd/nand/raw/ams-delta.c
@@ -387,12 +387,15 @@ static int gpio_nand_remove(struct platform_device *pdev)
{
struct gpio_nand *priv = platform_get_drvdata(pdev);
struct mtd_info *mtd = nand_to_mtd(&priv->nand_chip);
+ int ret;
/* Apply write protection */
gpiod_set_value(priv->gpiod_nwp, 1);
/* Unregister device */
- nand_release(mtd_to_nand(mtd));
+ ret = mtd_device_unregister(mtd);
+ WARN_ON(ret);
+ nand_cleanup(mtd_to_nand(mtd));
return 0;
}