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

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

mtd: tmio_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 5667bc8a

drivers/mtd/nand/tmio_nand.c

+1 −9
Original line number Diff line number Diff line
@@ -381,10 +381,8 @@ static int tmio_probe(struct platform_device *dev) 
	struct tmio_nand *tmio;

	struct mtd_info *mtd;

	struct nand_chip *nand_chip;

#ifdef CONFIG_MTD_PARTITIONS

	struct mtd_partition *parts;

	int nbparts = 0;

#endif

	int retval;



	if (data == NULL)
@@ -463,7 +461,6 @@ static int tmio_probe(struct platform_device *dev) 
		goto err_scan;

	}

	/* Register the partitions */

#ifdef CONFIG_MTD_PARTITIONS

#ifdef CONFIG_MTD_CMDLINE_PARTS

	nbparts = parse_mtd_partitions(mtd, part_probes, &parts, 0);

#endif
@@ -472,12 +469,7 @@ static int tmio_probe(struct platform_device *dev) 
		nbparts = data->num_partitions;

	}



	if (nbparts)

		retval = add_mtd_partitions(mtd, parts, nbparts);

	else

#endif

	retval = add_mtd_device(mtd);



	retval = mtd_device_register(mtd, parts, nbparts);

	if (!retval)

		return retval;