Message ID | 200905121623.32809.david-b@pacbell.net |
---|---|
State | Accepted |
Commit | f19e8999a5631e3af0e1ca5127af80a25aba1fd7 |
Headers | show |
On Tue, 2009-05-12 at 16:23 -0700, David Brownell wrote: > From: David Brownell <dbrownell@users.sourceforge.net> > > Remove some legacy code from the davinci_nand driver, which made > cmdlinepart ignore the the MTD ID passed to it. Boards can have > multiple NAND chips, and some do (like the DM357 EVM), so this > dated hack is undesirable. > > Correct labels a"re like davinci_nand.0" (for chipselect 0). > > Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Taken to l2-mtd-2.6.git.
--- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -718,19 +718,8 @@ syndrome_done: static const char *probes[] __initconst = { "cmdlinepart", NULL }; - const char *master_name; - - /* Set info->mtd.name = 0 temporarily */ - master_name = info->mtd.name; - info->mtd.name = (char *)0; - - /* info->mtd.name == 0, means: don't bother checking - <mtd-id> */ mtd_parts_nb = parse_mtd_partitions(&info->mtd, probes, &mtd_parts, 0); - - /* Restore info->mtd.name */ - info->mtd.name = master_name; } if (mtd_parts_nb <= 0) {