mtd: nand: Provide nand_cleanup() function to free NAND related resources

Provide a nand_cleanup() function to free all nand related resources
without unregistering the mtd device.
This should allow drivers to call mtd_device_unregister() and handle
its return value and still being able to cleanup all nand related
resources.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Daniel Walter <dwalter@sigma-star.at>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>

1 files changed, 15 insertions, 7 deletions

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index c06146941e16..7a00245ebada 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -4799,19 +4799,15 @@ int nand_scan(struct mtd_info *mtd, int maxchips)
 EXPORT_SYMBOL(nand_scan);
 
 /**
- * nand_release - [NAND Interface] Free resources held by the NAND device
- * @mtd: MTD device structure
+ * nand_cleanup - [NAND Interface] Free resources held by the NAND device
+ * @chip: NAND chip object
  */
-void nand_release(struct mtd_info *mtd)
+void nand_cleanup(struct nand_chip *chip)
 {
-        struct nand_chip *chip = mtd_to_nand(mtd);
-
         if (chip->ecc.mode == NAND_ECC_SOFT &&
             chip->ecc.algo == NAND_ECC_BCH)
                 nand_bch_free((struct nand_bch_control *)chip->ecc.priv);
 
-        mtd_device_unregister(mtd);
-
         nand_release_data_interface(chip);
 
         /* Free bad block table memory */
@@ -4824,6 +4820,18 @@ void nand_release(struct mtd_info *mtd)
                         & NAND_BBT_DYNAMICSTRUCT)
                 kfree(chip->badblock_pattern);
 }
+EXPORT_SYMBOL_GPL(nand_cleanup);
+
+/**
+ * nand_release - [NAND Interface] Unregister the MTD device and free resources
+ *                held by the NAND device
+ * @mtd: MTD device structure
+ */
+void nand_release(struct mtd_info *mtd)
+{
+        mtd_device_unregister(mtd);
+        nand_cleanup(mtd_to_nand(mtd));
+}
 EXPORT_SYMBOL_GPL(nand_release);
 
 MODULE_LICENSE("GPL");