diff options
author | Jamie Iles <jamie@jamieiles.com> | 2011-05-23 05:23:29 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2011-05-24 21:23:45 -0400 |
commit | a04d23dfea631993bcb256c638e379c002af9e4f (patch) | |
tree | 81d29a90804e8c90c87aeede514f17761ffc996b /drivers/mtd/nand | |
parent | 1f3a7c626f7e55657255df89fab418714502093a (diff) |
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/nand')
-rw-r--r-- | drivers/mtd/nand/nomadik_nand.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c index a045a4a581b6..b6a5c86ab31e 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) | |||
158 | goto err_unmap; | 158 | goto err_unmap; |
159 | } | 159 | } |
160 | 160 | ||
161 | #ifdef CONFIG_MTD_PARTITIONS | 161 | mtd_device_register(&host->mtd, pdata->parts, pdata->nparts); |
162 | add_mtd_partitions(&host->mtd, pdata->parts, pdata->nparts); | ||
163 | #else | ||
164 | pr_info("Registering %s as whole device\n", mtd->name); | ||
165 | add_mtd_device(mtd); | ||
166 | #endif | ||
167 | 162 | ||
168 | platform_set_drvdata(pdev, host); | 163 | platform_set_drvdata(pdev, host); |
169 | return 0; | 164 | return 0; |