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

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

mtd: sst25l: convert to mtd_device_register() 



Convert to mtd_device_register() and remove the check for
mtd_has_partitions() as we always have partitioning enabled now.

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 436c06da

drivers/mtd/devices/sst25l.c

+26 −36
Original line number Diff line number Diff line
@@ -381,6 +381,8 @@ static int __devinit sst25l_probe(struct spi_device *spi) 
	struct sst25l_flash *flash;

	struct flash_platform_data *data;

	int ret, i;

	struct mtd_partition *parts = NULL;

	int nr_parts = 0;



	flash_info = sst25l_match_device(spi);

	if (!flash_info)
@@ -420,13 +422,9 @@ static int __devinit sst25l_probe(struct spi_device *spi) 
	      flash->mtd.erasesize, flash->mtd.erasesize / 1024,

	      flash->mtd.numeraseregions);



	if (mtd_has_partitions()) {

		struct mtd_partition *parts = NULL;

		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(&flash->mtd,

						part_probes,
@@ -450,16 +448,11 @@ static int __devinit sst25l_probe(struct spi_device *spi) 
		}



		flash->partitioned = 1;

			return add_mtd_partitions(&flash->mtd,

						  parts, nr_parts);

		return mtd_device_register(&flash->mtd, parts,

					   nr_parts);

	}



	} else if (data && data->nr_parts) {

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

			 data->nr_parts, data->name);

	}



	ret = add_mtd_device(&flash->mtd);

	ret = mtd_device_register(&flash->mtd, NULL, 0);

	if (ret == 1) {

		kfree(flash);

		dev_set_drvdata(&spi->dev, NULL);
@@ -474,10 +467,7 @@ static int __devexit sst25l_remove(struct spi_device *spi) 
	struct sst25l_flash *flash = dev_get_drvdata(&spi->dev);

	int ret;



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

		ret = del_mtd_partitions(&flash->mtd);

	else

		ret = del_mtd_device(&flash->mtd);

	ret = mtd_device_unregister(&flash->mtd);

	if (ret == 0)

		kfree(flash);

	return ret;