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

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

mtd: fsmc_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 13c41db9

drivers/mtd/nand/fsmc_nand.c

+4 −21
Original line number Diff line number Diff line
@@ -120,8 +120,6 @@ static struct fsmc_eccplace fsmc_ecc4_sp_place = { 
	}

};





#ifdef CONFIG_MTD_PARTITIONS

/*

 * Default partition tables to be used if the partition information not

 * provided through platform data.
@@ -182,7 +180,6 @@ static struct mtd_partition partition_info_128KB_blk[] = { 
#ifdef CONFIG_MTD_CMDLINE_PARTS

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

#endif

#endif



/**

 * struct fsmc_nand_data - structure for FSMC NAND device state
@@ -719,7 +716,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) 
	 * platform data,

	 * default partition information present in driver.

	 */

#ifdef CONFIG_MTD_PARTITIONS

#ifdef CONFIG_MTD_CMDLINE_PARTS

	/*

	 * Check if partition info passed via command line
@@ -777,19 +773,10 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) 
	}

#endif



	if (host->partitions) {

		ret = add_mtd_partitions(&host->mtd, host->partitions,

	ret = mtd_device_register(&host->mtd, host->partitions,

				  host->nr_partitions);

	if (ret)

		goto err_probe;

	}

#else

	dev_info(&pdev->dev, "Registering %s as whole device\n", mtd->name);

	if (!add_mtd_device(mtd)) {

		ret = -ENXIO;

		goto err_probe;

	}

#endif



	platform_set_drvdata(pdev, host);

	dev_info(&pdev->dev, "FSMC NAND driver registration successful\n");
@@ -835,11 +822,7 @@ static int fsmc_nand_remove(struct platform_device *pdev) 
	platform_set_drvdata(pdev, NULL);



	if (host) {

#ifdef CONFIG_MTD_PARTITIONS

		del_mtd_partitions(&host->mtd);

#else

		del_mtd_device(&host->mtd);

#endif

		mtd_device_unregister(&host->mtd);

		clk_disable(host->clk);

		clk_put(host->clk);