mtd: rawnand: ingenic: Stop using nand_release()
authorMiquel Raynal <miquel.raynal@bootlin.com>
Tue, 19 May 2020 12:59:55 +0000 (14:59 +0200)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Sun, 31 May 2020 08:53:34 +0000 (10:53 +0200)
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>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
Link: https://lore.kernel.org/linux-mtd/20200519130035.1883-23-miquel.raynal@bootlin.com
drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c

index 3bfb6fa..2af1b54 100644 (file)
@@ -387,13 +387,18 @@ static int ingenic_nand_init_chip(struct platform_device *pdev,
 
 static void ingenic_nand_cleanup_chips(struct ingenic_nfc *nfc)
 {
-       struct ingenic_nand *chip;
+       struct ingenic_nand *ingenic_chip;
+       struct nand_chip *chip;
+       int ret;
 
        while (!list_empty(&nfc->chips)) {
-               chip = list_first_entry(&nfc->chips,
-                                       struct ingenic_nand, chip_list);
-               nand_release(&chip->chip);
-               list_del(&chip->chip_list);
+               ingenic_chip = list_first_entry(&nfc->chips,
+                                               struct ingenic_nand, chip_list);
+               chip = &ingenic_chip->chip;
+               ret = mtd_device_unregister(nand_to_mtd(chip));
+               WARN_ON(ret);
+               nand_cleanup(chip);
+               list_del(&ingenic_chip->chip_list);
        }
 }