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

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

mtd: scx200_docflash: 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 2fe2e24e

drivers/mtd/maps/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ config MTD_VMAX 


config MTD_SCx200_DOCFLASH

	tristate "Flash device mapped with DOCCS on NatSemi SCx200"

	depends on SCx200 && MTD_CFI && MTD_PARTITIONS

	depends on SCx200 && MTD_CFI

	help

	  Enable support for a flash chip mapped using the DOCCS signal on a

	  National Semiconductor SCx200 processor.

drivers/mtd/maps/scx200_docflash.c

+3 −13
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ static struct resource docmem = { 


static struct mtd_info *mymtd;



#ifdef CONFIG_MTD_PARTITIONS

static struct mtd_partition partition_info[] = {

	{

		.name   = "DOCCS Boot kernel",
@@ -68,8 +67,6 @@ static struct mtd_partition partition_info[] = { 
	},

};

#define NUM_PARTITIONS ARRAY_SIZE(partition_info)

#endif





static struct map_info scx200_docflash_map = {

	.name      = "NatSemi SCx200 DOCCS Flash",
@@ -198,24 +195,17 @@ static int __init init_scx200_docflash(void) 


	mymtd->owner = THIS_MODULE;



#ifdef CONFIG_MTD_PARTITIONS

	partition_info[3].offset = mymtd->size-partition_info[3].size;

	partition_info[2].size = partition_info[3].offset-partition_info[2].offset;

	add_mtd_partitions(mymtd, partition_info, NUM_PARTITIONS);

#else

	add_mtd_device(mymtd);

#endif

	mtd_device_register(mymtd, partition_info, NUM_PARTITIONS);



	return 0;

}



static void __exit cleanup_scx200_docflash(void)

{

	if (mymtd) {

#ifdef CONFIG_MTD_PARTITIONS

		del_mtd_partitions(mymtd);

#else

		del_mtd_device(mymtd);

#endif

		mtd_device_unregister(mymtd);

		map_destroy(mymtd);

	}

	if (scx200_docflash_map.virt) {