Commit f16bd7ca authored May 24, 2016 by Boris Brezillon

mtd: nand: Kill the MTD_NAND_IDS Kconfig option

MTD_NAND_IDS is selected by MTD_NAND, which makes it useless. Remove
the Kconfig option and link nand_ids.o into the nand.o object file.
Doing that also prevents creating an extra nand_ids.ko module when
MTD_NAND is activated as a module.

Since nand_ids.c is no longer compiled as a standalone module and the
nand_manuf_ids/nand_flash_ids symbols are only used in nand_base.c, we
can get rid of the MODULE_XXX() and EXPORT_SYMBOL() definitions.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>

parent 8cfb9ab6

arch/cris/arch-v32/drivers/Kconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -136,7 +136,6 @@ config ETRAX_NANDFLASH
	bool "NAND flash support"		bool "NAND flash support"
	depends on ETRAX_ARCH_V32		depends on ETRAX_ARCH_V32
	select MTD_NAND		select MTD_NAND
	select MTD_NAND_IDS
	help		help
	This option enables MTD mapping of NAND flash devices. Needed to use		This option enables MTD mapping of NAND flash devices. Needed to use
	NAND flash memories. If unsure, say Y.		NAND flash memories. If unsure, say Y.

drivers/mtd/nand/Kconfig

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,6 @@ config MTD_NAND_ECC_SMC
	menuconfig MTD_NAND		menuconfig MTD_NAND
	tristate "NAND Device Support"		tristate "NAND Device Support"
	depends on MTD		depends on MTD
	select MTD_NAND_IDS
	select MTD_NAND_ECC		select MTD_NAND_ECC
	help		help
	This enables support for accessing all type of NAND flash		This enables support for accessing all type of NAND flash
	@@ -109,9 +108,6 @@ config MTD_NAND_OMAP_BCH
	config MTD_NAND_OMAP_BCH_BUILD		config MTD_NAND_OMAP_BCH_BUILD
	def_tristate MTD_NAND_OMAP2 && MTD_NAND_OMAP_BCH		def_tristate MTD_NAND_OMAP2 && MTD_NAND_OMAP_BCH

	config MTD_NAND_IDS
	tristate

	config MTD_NAND_RICOH		config MTD_NAND_RICOH
	tristate "Ricoh xD card reader"		tristate "Ricoh xD card reader"
	default n		default n

drivers/mtd/nand/Makefile

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,6 @@
	obj-$(CONFIG_MTD_NAND) += nand.o		obj-$(CONFIG_MTD_NAND) += nand.o
	obj-$(CONFIG_MTD_NAND_ECC) += nand_ecc.o		obj-$(CONFIG_MTD_NAND_ECC) += nand_ecc.o
	obj-$(CONFIG_MTD_NAND_BCH) += nand_bch.o		obj-$(CONFIG_MTD_NAND_BCH) += nand_bch.o
	obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o
	obj-$(CONFIG_MTD_SM_COMMON) += sm_common.o		obj-$(CONFIG_MTD_SM_COMMON) += sm_common.o

	obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nand.o		obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nand.o
	@@ -61,4 +60,4 @@ obj-$(CONFIG_MTD_NAND_BRCMNAND) += brcmnand/
	obj-$(CONFIG_MTD_NAND_QCOM) += qcom_nandc.o		obj-$(CONFIG_MTD_NAND_QCOM) += qcom_nandc.o
	obj-$(CONFIG_MTD_NAND_MTK) += mtk_nand.o mtk_ecc.o		obj-$(CONFIG_MTD_NAND_MTK) += mtk_nand.o mtk_ecc.o

	nand-objs := nand_base.o nand_bbt.o nand_timings.o		nand-objs := nand_base.o nand_bbt.o nand_timings.o nand_ids.o

drivers/mtd/nand/nand_ids.c

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -188,10 +188,3 @@ struct nand_manufacturer nand_manuf_ids[] = {
	{NAND_MFR_WINBOND, "Winbond"},		{NAND_MFR_WINBOND, "Winbond"},
	{0x0, "Unknown"}		{0x0, "Unknown"}
	};		};

	EXPORT_SYMBOL(nand_manuf_ids);
	EXPORT_SYMBOL(nand_flash_ids);

	MODULE_LICENSE("GPL");
	MODULE_AUTHOR("Thomas Gleixner <tglx@linutronix.de>");
	MODULE_DESCRIPTION("Nand device & manufacturer IDs");