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

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

mtd: octeon: convert to mtd_device_register() 



Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.

Cc: Ralf Baechle <ralf@linux-mips.org>
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 36cda05b

arch/mips/cavium-octeon/flash_setup.c

+1 −10
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


static struct map_info flash_map;

static struct mtd_info *mymtd;

#ifdef CONFIG_MTD_PARTITIONS

static int nr_parts;

static struct mtd_partition *parts;

static const char *part_probe_types[] = {
@@ -26,7 +25,6 @@ static const char *part_probe_types[] = { 
#endif

	NULL

};

#endif



/**

 * Module/ driver initialization.
@@ -63,17 +61,10 @@ static int __init flash_init(void) 
		if (mymtd) {

			mymtd->owner = THIS_MODULE;



#ifdef CONFIG_MTD_PARTITIONS

			nr_parts = parse_mtd_partitions(mymtd,

							part_probe_types,

							&parts, 0);

			if (nr_parts > 0)

				add_mtd_partitions(mymtd, parts, nr_parts);

			else

				add_mtd_device(mymtd);

#else

			add_mtd_device(mymtd);

#endif

			mtd_device_register(mymtd, parts, nr_parts);

		} else {

			pr_err("Failed to register MTD device for flash\n");

		}