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

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

mtd: uclinux: 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 b5c0a4ea

drivers/mtd/maps/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ config MTD_GPIO_ADDR 


config MTD_UCLINUX

	bool "Generic uClinux RAM/ROM filesystem support"

	depends on MTD_PARTITIONS && MTD_RAM=y && !MMU

	depends on MTD_RAM=y && !MMU

	help

	  Map driver to support image based filesystems for uClinux.

drivers/mtd/maps/uclinux.c

+2 −10
Original line number Diff line number Diff line
@@ -89,11 +89,7 @@ static int __init uclinux_mtd_init(void) 
	mtd->priv = mapp;



	uclinux_ram_mtdinfo = mtd;

#ifdef CONFIG_MTD_PARTITIONS

	add_mtd_partitions(mtd, uclinux_romfs, NUM_PARTITIONS);

#else

	add_mtd_device(mtd);

#endif

	mtd_device_register(mtd, uclinux_romfs, NUM_PARTITIONS);



	return(0);

}
@@ -103,11 +99,7 @@ static int __init uclinux_mtd_init(void) 
static void __exit uclinux_mtd_cleanup(void)

{

	if (uclinux_ram_mtdinfo) {

#ifdef CONFIG_MTD_PARTITIONS

		del_mtd_partitions(uclinux_ram_mtdinfo);

#else

		del_mtd_device(uclinux_ram_mtdinfo);

#endif

		mtd_device_unregister(uclinux_ram_mtdinfo);

		map_destroy(uclinux_ram_mtdinfo);

		uclinux_ram_mtdinfo = NULL;

	}