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

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

mtd: plat-ram: 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 902766bf

drivers/mtd/maps/plat-ram.c

+9 −15
Original line number Diff line number Diff line
@@ -94,14 +94,11 @@ static int platram_remove(struct platform_device *pdev) 
		return 0;



	if (info->mtd) {

#ifdef CONFIG_MTD_PARTITIONS

		mtd_device_unregister(info->mtd);

		if (info->partitions) {

			del_mtd_partitions(info->mtd);

			if (info->free_partitions)

				kfree(info->partitions);

		}

#endif

		del_mtd_device(info->mtd);

		map_destroy(info->mtd);

	}
@@ -231,7 +228,6 @@ static int platram_probe(struct platform_device *pdev) 
	/* check to see if there are any available partitions, or wether

	 * to add this device whole */



#ifdef CONFIG_MTD_PARTITIONS

	if (!pdata->nr_partitions) {

		/* try to probe using the supplied probe type */

		if (pdata->probes) {
@@ -239,24 +235,22 @@ static int platram_probe(struct platform_device *pdev) 
					   &info->partitions, 0);

			info->free_partitions = 1;

			if (err > 0)

				err = add_mtd_partitions(info->mtd,

				err = mtd_device_register(info->mtd,

					info->partitions, err);

		}

	}

	/* use the static mapping */

	else

		err = add_mtd_partitions(info->mtd, pdata->partitions,

		err = mtd_device_register(info->mtd, pdata->partitions,

					  pdata->nr_partitions);

#endif /* CONFIG_MTD_PARTITIONS */



	if (add_mtd_device(info->mtd)) {

		dev_err(&pdev->dev, "add_mtd_device() failed\n");

		err = -ENOMEM;

	}



	if (!err)

		dev_info(&pdev->dev, "registered mtd device\n");



	/* add the whole device. */

	err = mtd_device_register(info->mtd, NULL, 0);

	if (err)

		dev_err(&pdev->dev, "failed to register the entire device\n");



	return err;



 exit_free: