aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2009-05-12 19:23:32 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-06-05 12:49:58 -0400
commitf19e8999a5631e3af0e1ca5127af80a25aba1fd7 (patch)
tree41f4367269932a3e5a2eb5c3f52342e5ce9c2695
parentee8f37688966ab1438d0cf42e0cb7c6595d9592c (diff)
mtd: davinci_nand: cmdlinepart uses MTD IDs
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 are like "davinci_nand.0" (for chipselect 0). Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/nand/davinci_nand.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index cb5a05e01531..ba6940d1d3d1 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -717,19 +717,8 @@ syndrome_done:
717 static const char *probes[] __initconst = 717 static const char *probes[] __initconst =
718 { "cmdlinepart", NULL }; 718 { "cmdlinepart", NULL };
719 719
720 const char *master_name;
721
722 /* Set info->mtd.name = 0 temporarily */
723 master_name = info->mtd.name;
724 info->mtd.name = (char *)0;
725
726 /* info->mtd.name == 0, means: don't bother checking
727 <mtd-id> */
728 mtd_parts_nb = parse_mtd_partitions(&info->mtd, probes, 720 mtd_parts_nb = parse_mtd_partitions(&info->mtd, probes,
729 &mtd_parts, 0); 721 &mtd_parts, 0);
730
731 /* Restore info->mtd.name */
732 info->mtd.name = master_name;
733 } 722 }
734 723
735 if (mtd_parts_nb <= 0) { 724 if (mtd_parts_nb <= 0) {