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

Commit 5ffcaf3d authored by Jamie Iles's avatar Jamie Iles Committed by David Woodhouse
Browse files

mtd: nand: convert to mtd_device_register() 



Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.

Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 984e6d8e

drivers/mtd/nand/nand_base.c

+1 −9
Original line number Diff line number Diff line
@@ -47,10 +47,7 @@ 
#include <linux/bitops.h>

#include <linux/leds.h>

#include <linux/io.h>



#ifdef CONFIG_MTD_PARTITIONS

#include <linux/mtd/partitions.h>

#endif



/* Define default oob placement schemes for large and small page devices */

static struct nand_ecclayout nand_oob_8 = {
@@ -3535,12 +3532,7 @@ void nand_release(struct mtd_info *mtd) 
	if (chip->ecc.mode == NAND_ECC_SOFT_BCH)

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



#ifdef CONFIG_MTD_PARTITIONS

	/* Deregister partitions */

	del_mtd_partitions(mtd);

#endif

	/* Deregister the device */

	del_mtd_device(mtd);

	mtd_device_unregister(mtd);



	/* Free bad block table memory */

	kfree(chip->bbt);