Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b9dcd96 authored by Richard Weinberger's avatar Richard Weinberger Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit d44154f969a44269a9288c274c1c2fd9e85df8a5 ]

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: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarDaniel Walter <dwalter@sigma-star.at>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 557d674f

drivers/mtd/nand/nand_base.c

+15 −7
Original line number Diff line number Diff line
@@ -4427,18 +4427,14 @@ 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->priv;



	if (chip->ecc.mode == NAND_ECC_SOFT_BCH)

		nand_bch_free((struct nand_bch_control *)chip->ecc.priv);



	mtd_device_unregister(mtd);



	/* Free bad block table memory */

	kfree(chip->bbt);

	if (!(chip->options & NAND_OWN_BUFFERS))
@@ -4449,6 +4445,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->priv);

}

EXPORT_SYMBOL_GPL(nand_release);



static int __init nand_base_init(void)

include/linux/mtd/nand.h

+5 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ extern int nand_scan_ident(struct mtd_info *mtd, int max_chips, 
			   struct nand_flash_dev *table);

extern int nand_scan_tail(struct mtd_info *mtd);



/* Free resources held by the NAND device */

/* Unregister the MTD device and free resources held by the NAND device */

extern void nand_release(struct mtd_info *mtd);



/* Internal helper for board drivers which need to override command function */
@@ -1029,4 +1029,8 @@ int nand_check_erased_ecc_chunk(void *data, int datalen, 
				void *ecc, int ecclen,

				void *extraoob, int extraooblen,

				int threshold);



/* Free resources held by the NAND device */

void nand_cleanup(struct nand_chip *chip);



#endif /* __LINUX_MTD_NAND_H */