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

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

mtd: fsl_elbc_nand: 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 da499d41

drivers/mtd/nand/fsl_elbc_nand.c

+1 −11
Original line number Diff line number Diff line
@@ -841,12 +841,9 @@ static int __devinit fsl_elbc_nand_probe(struct platform_device *pdev) 
	struct fsl_elbc_mtd *priv;

	struct resource res;

	struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl;



#ifdef CONFIG_MTD_PARTITIONS

	static const char *part_probe_types[]

		= { "cmdlinepart", "RedBoot", NULL };

	struct mtd_partition *parts;

#endif

	int ret;

	int bank;

	struct device *dev;
@@ -935,26 +932,19 @@ static int __devinit fsl_elbc_nand_probe(struct platform_device *pdev) 
	if (ret)

		goto err;



#ifdef CONFIG_MTD_PARTITIONS

	/* First look for RedBoot table or partitions on the command

	 * line, these take precedence over device tree information */

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

	if (ret < 0)

		goto err;



#ifdef CONFIG_MTD_OF_PARTS

	if (ret == 0) {

		ret = of_mtd_parse_partitions(priv->dev, node, &parts);

		if (ret < 0)

			goto err;

	}

#endif



	if (ret > 0)

		add_mtd_partitions(&priv->mtd, parts, ret);

	else

#endif

		add_mtd_device(&priv->mtd);

	mtd_device_register(&priv->mtd, parts, ret);



	printk(KERN_INFO "eLBC NAND device at 0x%llx, bank %d\n",

	       (unsigned long long)res.start, priv->bank);