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

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

mtd: dataflash: 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 ba52f3a2

drivers/mtd/devices/mtd_dataflash.c

+18 −27
Original line number Diff line number Diff line
@@ -637,6 +637,8 @@ add_dataflash_otp(struct spi_device *spi, char *name, 
	struct flash_platform_data	*pdata = spi->dev.platform_data;

	char				*otp_tag = "";

	int				err = 0;

	struct mtd_partition		*parts;

	int				nr_parts = 0;



	priv = kzalloc(sizeof *priv, GFP_KERNEL);

	if (!priv)
@@ -675,16 +677,11 @@ add_dataflash_otp(struct spi_device *spi, char *name, 
			pagesize, otp_tag);

	dev_set_drvdata(&spi->dev, priv);



	if (mtd_has_partitions()) {

		struct mtd_partition	*parts;

		int			nr_parts = 0;



	if (mtd_has_cmdlinepart()) {

			static const char *part_probes[]

					= { "cmdlinepart", NULL, };

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



			nr_parts = parse_mtd_partitions(device,

					part_probes, &parts, 0);

		nr_parts = parse_mtd_partitions(device, part_probes, &parts,

						0);

	}



	if (nr_parts <= 0 && pdata && pdata->parts) {
@@ -694,14 +691,11 @@ add_dataflash_otp(struct spi_device *spi, char *name, 


	if (nr_parts > 0) {

		priv->partitioned = 1;

			err = add_mtd_partitions(device, parts, nr_parts);

		err = mtd_device_register(device, parts, nr_parts);

		goto out;

	}

	} else if (pdata && pdata->nr_parts)

		dev_warn(&spi->dev, "ignoring %d default partitions on %s\n",

				pdata->nr_parts, device->name);



	if (add_mtd_device(device) == 1)

	if (mtd_device_register(device, NULL, 0) == 1)

		err = -ENODEV;



out:
@@ -939,10 +933,7 @@ static int __devexit dataflash_remove(struct spi_device *spi) 


	DEBUG(MTD_DEBUG_LEVEL1, "%s: remove\n", dev_name(&spi->dev));



	if (mtd_has_partitions() && flash->partitioned)

		status = del_mtd_partitions(&flash->mtd);

	else

		status = del_mtd_device(&flash->mtd);

	status = mtd_device_unregister(&flash->mtd);

	if (status == 0) {

		dev_set_drvdata(&spi->dev, NULL);

		kfree(flash);