iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: scx200_docflash: convert to mtd_device_register()

Browse Source 
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:10 +01:00 committed by David Woodhouse
parent 2fe2e24ead
commit f6c11c1826
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/maps/Kconfig
View File

@ -184,7 +184,7 @@ config MTD_VMAX
config MTD_SCx200_DOCFLASH config MTD_SCx200_DOCFLASH
tristate "Flash device mapped with DOCCS on NatSemi SCx200" tristate "Flash device mapped with DOCCS on NatSemi SCx200"
depends on SCx200 && MTD_CFI && MTD_PARTITIONS depends on SCx200 && MTD_CFI
help help
Enable support for a flash chip mapped using the DOCCS signal on a Enable support for a flash chip mapped using the DOCCS signal on a
National Semiconductor SCx200 processor. National Semiconductor SCx200 processor.

16
drivers/mtd/maps/scx200_docflash.c
View File

@ -44,7 +44,6 @@ static struct resource docmem = {
static struct mtd_info *mymtd; static struct mtd_info *mymtd;
#ifdef CONFIG_MTD_PARTITIONS
static struct mtd_partition partition_info[] = { static struct mtd_partition partition_info[] = {
{ {
.name = "DOCCS Boot kernel", .name = "DOCCS Boot kernel",
@ -68,8 +67,6 @@ static struct mtd_partition partition_info[] = {
}, },
}; };
#define NUM_PARTITIONS ARRAY_SIZE(partition_info) #define NUM_PARTITIONS ARRAY_SIZE(partition_info)
#endif
static struct map_info scx200_docflash_map = { static struct map_info scx200_docflash_map = {
.name = "NatSemi SCx200 DOCCS Flash", .name = "NatSemi SCx200 DOCCS Flash",
@ -198,24 +195,17 @@ static int __init init_scx200_docflash(void)
mymtd->owner = THIS_MODULE; mymtd->owner = THIS_MODULE;
#ifdef CONFIG_MTD_PARTITIONS
partition_info[3].offset = mymtd->size-partition_info[3].size; partition_info[3].offset = mymtd->size-partition_info[3].size;
partition_info[2].size = partition_info[3].offset-partition_info[2].offset; partition_info[2].size = partition_info[3].offset-partition_info[2].offset;
add_mtd_partitions(mymtd, partition_info, NUM_PARTITIONS); mtd_device_register(mymtd, partition_info, NUM_PARTITIONS);
#else
add_mtd_device(mymtd);
#endif
return 0; return 0;
} }
static void __exit cleanup_scx200_docflash(void) static void __exit cleanup_scx200_docflash(void)
{ {
if (mymtd) { if (mymtd) {
#ifdef CONFIG_MTD_PARTITIONS mtd_device_unregister(mymtd);
del_mtd_partitions(mymtd);
#else
del_mtd_device(mymtd);
#endif
map_destroy(mymtd); map_destroy(mymtd);
} }
if (scx200_docflash_map.virt) { if (scx200_docflash_map.virt) {