summaryrefslogtreecommitdiff
path: root/drivers/mtd
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-05-23 10:23:29 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2011-05-25 02:23:45 +0100
commita04d23dfea631993bcb256c638e379c002af9e4f (patch)
tree81d29a90804e8c90c87aeede514f17761ffc996b /drivers/mtd
parent1f3a7c626f7e55657255df89fab418714502093a (diff)
downloadlinux-3.10-a04d23dfea631993bcb256c638e379c002af9e4f.tar.gz
linux-3.10-a04d23dfea631993bcb256c638e379c002af9e4f.tar.bz2
linux-3.10-a04d23dfea631993bcb256c638e379c002af9e4f.zip
mtd: nomadik_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: Jamie Iles <jamie@jamieiles.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/nomadik_nand.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
index a045a4a581b..b6a5c86ab31 100644
--- a/drivers/mtd/nand/nomadik_nand.c
+++ b/drivers/mtd/nand/nomadik_nand.c
@@ -158,12 +158,7 @@ static int nomadik_nand_probe(struct platform_device *pdev)
goto err_unmap;
}
-#ifdef CONFIG_MTD_PARTITIONS
- add_mtd_partitions(&host->mtd, pdata->parts, pdata->nparts);
-#else
- pr_info("Registering %s as whole device\n", mtd->name);
- add_mtd_device(mtd);
-#endif
+ mtd_device_register(&host->mtd, pdata->parts, pdata->nparts);
platform_set_drvdata(pdev, host);
return 0;