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

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

mtd: bfin: convert to mtd_device_register() 



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

Cc: Mike Frysinger <vapier@gentoo.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 78352282

arch/blackfin/mach-bf537/boards/stamp.c

+0 −4
Original line number Diff line number Diff line
@@ -381,7 +381,6 @@ static struct platform_device net2272_bfin_device = { 
#endif



#if defined(CONFIG_MTD_NAND_PLATFORM) || defined(CONFIG_MTD_NAND_PLATFORM_MODULE)

#ifdef CONFIG_MTD_PARTITIONS

const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };



static struct mtd_partition bfin_plat_nand_partitions[] = {
@@ -395,7 +394,6 @@ static struct mtd_partition bfin_plat_nand_partitions[] = { 
		.offset = MTDPART_OFS_APPEND,

	},

};

#endif



#define BFIN_NAND_PLAT_CLE 2

#define BFIN_NAND_PLAT_ALE 1
@@ -422,11 +420,9 @@ static struct platform_nand_data bfin_plat_nand_data = { 
	.chip = {

		.nr_chips = 1,

		.chip_delay = 30,

#ifdef CONFIG_MTD_PARTITIONS

		.part_probe_types = part_probes,

		.partitions = bfin_plat_nand_partitions,

		.nr_partitions = ARRAY_SIZE(bfin_plat_nand_partitions),

#endif

	},

	.ctrl = {

		.cmd_ctrl  = bfin_plat_nand_cmd_ctrl,

arch/blackfin/mach-bf561/boards/acvilon.c

+0 −4
Original line number Diff line number Diff line
@@ -243,7 +243,6 @@ static struct platform_device bfin_uart0_device = { 


#if defined(CONFIG_MTD_NAND_PLATFORM) || defined(CONFIG_MTD_NAND_PLATFORM_MODULE)



#ifdef CONFIG_MTD_PARTITIONS

const char *part_probes[] = { "cmdlinepart", NULL };



static struct mtd_partition bfin_plat_nand_partitions[] = {
@@ -257,7 +256,6 @@ static struct mtd_partition bfin_plat_nand_partitions[] = { 
	     .offset = MTDPART_OFS_APPEND,

	     },

};

#endif



#define BFIN_NAND_PLAT_CLE 2

#define BFIN_NAND_PLAT_ALE 3
@@ -286,11 +284,9 @@ static struct platform_nand_data bfin_plat_nand_data = { 
	.chip = {

		 .nr_chips = 1,

		 .chip_delay = 30,

#ifdef CONFIG_MTD_PARTITIONS

		 .part_probe_types = part_probes,

		 .partitions = bfin_plat_nand_partitions,

		 .nr_partitions = ARRAY_SIZE(bfin_plat_nand_partitions),

#endif

		 },

	.ctrl = {

		 .cmd_ctrl = bfin_plat_nand_cmd_ctrl,

drivers/mtd/maps/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -453,7 +453,6 @@ config MTD_PCMCIA_ANONYMOUS 
config MTD_BFIN_ASYNC

	tristate "Blackfin BF533-STAMP Flash Chip Support"

	depends on BFIN533_STAMP && MTD_CFI && MTD_COMPLEX_MAPPINGS

	select MTD_PARTITIONS

	default y

	help

	  Map driver which allows for simultaneous utilization of

drivers/mtd/maps/bfin-async-flash.c

+5 −16
Original line number Diff line number Diff line
@@ -41,9 +41,7 @@ struct async_state { 
	uint32_t flash_ambctl0, flash_ambctl1;

	uint32_t save_ambctl0, save_ambctl1;

	unsigned long irq_flags;

#ifdef CONFIG_MTD_PARTITIONS

	struct mtd_partition *parts;

#endif

};



static void switch_to_flash(struct async_state *state)
@@ -124,9 +122,7 @@ static void bfin_flash_copy_to(struct map_info *map, unsigned long to, const voi 
	switch_back(state);

}



#ifdef CONFIG_MTD_PARTITIONS

static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };

#endif



static int __devinit bfin_flash_probe(struct platform_device *pdev)

{
@@ -169,22 +165,17 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev) 
		return -ENXIO;

	}



#ifdef CONFIG_MTD_PARTITIONS

	ret = parse_mtd_partitions(state->mtd, part_probe_types, &pdata->parts, 0);

	if (ret > 0) {

		pr_devinit(KERN_NOTICE DRIVER_NAME ": Using commandline partition definition\n");

		add_mtd_partitions(state->mtd, pdata->parts, ret);

		mtd_device_register(state->mtd, pdata->parts, ret);

		state->parts = pdata->parts;



	} else if (pdata->nr_parts) {

		pr_devinit(KERN_NOTICE DRIVER_NAME ": Using board partition definition\n");

		add_mtd_partitions(state->mtd, pdata->parts, pdata->nr_parts);



	} else

#endif

	{

		mtd_device_register(state->mtd, pdata->parts, pdata->nr_parts);

	} else {

		pr_devinit(KERN_NOTICE DRIVER_NAME ": no partition info available, registering whole flash at once\n");

		add_mtd_device(state->mtd);

		mtd_device_register(state->mtd, NULL, 0);

	}



	platform_set_drvdata(pdev, state);
@@ -196,10 +187,8 @@ static int __devexit bfin_flash_remove(struct platform_device *pdev) 
{

	struct async_state *state = platform_get_drvdata(pdev);

	gpio_free(state->enet_flash_pin);

#ifdef CONFIG_MTD_PARTITIONS

	del_mtd_partitions(state->mtd);

	mtd_device_unregister(state->mtd);

	kfree(state->parts);

#endif

	map_destroy(state->mtd);

	kfree(state);

	return 0;