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: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Jamie Iles 2011-05-23 10:23:12 +01:00 коммит произвёл David Woodhouse
Родитель b5c0a4ea1b
Коммит 5e7e96866d
2 изменённых файлов: 3 добавлений и 11 удалений

Просмотреть файл

@ -472,7 +472,7 @@ config MTD_GPIO_ADDR
config MTD_UCLINUX config MTD_UCLINUX
bool "Generic uClinux RAM/ROM filesystem support" bool "Generic uClinux RAM/ROM filesystem support"
depends on MTD_PARTITIONS && MTD_RAM=y && !MMU depends on MTD_RAM=y && !MMU
help help
Map driver to support image based filesystems for uClinux. Map driver to support image based filesystems for uClinux.

Просмотреть файл

@ -89,11 +89,7 @@ static int __init uclinux_mtd_init(void)
mtd->priv = mapp; mtd->priv = mapp;
uclinux_ram_mtdinfo = mtd; uclinux_ram_mtdinfo = mtd;
#ifdef CONFIG_MTD_PARTITIONS mtd_device_register(mtd, uclinux_romfs, NUM_PARTITIONS);
add_mtd_partitions(mtd, uclinux_romfs, NUM_PARTITIONS);
#else
add_mtd_device(mtd);
#endif
return(0); return(0);
} }
@ -103,11 +99,7 @@ static int __init uclinux_mtd_init(void)
static void __exit uclinux_mtd_cleanup(void) static void __exit uclinux_mtd_cleanup(void)
{ {
if (uclinux_ram_mtdinfo) { if (uclinux_ram_mtdinfo) {
#ifdef CONFIG_MTD_PARTITIONS mtd_device_unregister(uclinux_ram_mtdinfo);
del_mtd_partitions(uclinux_ram_mtdinfo);
#else
del_mtd_device(uclinux_ram_mtdinfo);
#endif
map_destroy(uclinux_ram_mtdinfo); map_destroy(uclinux_ram_mtdinfo);
uclinux_ram_mtdinfo = NULL; uclinux_ram_mtdinfo = NULL;
} }