openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: omap2 onenand: convert to mtd_device_register() 

Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.

Cc: Kyungmin Park <kyungmin.park@samsung.com>
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>
This commit is contained in:
Jamie Iles 2011-05-23 10:23:38 +01:00 committed by David Woodhouse
parent c52840f878
commit ff6e1b26d5
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mtd/onenand/omap2.c
View File

@ -67,9 +67,7 @@ struct omap2_onenand {
struct regulator *regulator; struct regulator *regulator;
}; };
#ifdef CONFIG_MTD_PARTITIONS
static const char *part_probes[] = { "cmdlinepart", NULL, }; static const char *part_probes[] = { "cmdlinepart", NULL, };
#endif
static void omap2_onenand_dma_cb(int lch, u16 ch_status, void *data) static void omap2_onenand_dma_cb(int lch, u16 ch_status, void *data)
{ {
@ -755,15 +753,13 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
if ((r = onenand_scan(&c->mtd, 1)) < 0) if ((r = onenand_scan(&c->mtd, 1)) < 0)
goto err_release_regulator; goto err_release_regulator;
#ifdef CONFIG_MTD_PARTITIONS
r = parse_mtd_partitions(&c->mtd, part_probes, &c->parts, 0); r = parse_mtd_partitions(&c->mtd, part_probes, &c->parts, 0);
if (r > 0) if (r > 0)
r = add_mtd_partitions(&c->mtd, c->parts, r); r = mtd_device_register(&c->mtd, c->parts, r);
else if (pdata->parts != NULL) else if (pdata->parts != NULL)
r = add_mtd_partitions(&c->mtd, pdata->parts, pdata->nr_parts); r = mtd_device_register(&c->mtd, pdata->parts, pdata->nr_parts);
else else
#endif r = mtd_device_register(&c->mtd, NULL, 0);
r = add_mtd_device(&c->mtd);
if (r) if (r)
goto err_release_onenand; goto err_release_onenand;