mtd: davinci_nand: cmdlinepart uses MTD IDs

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=f19e8999a5631e3af0e1ca5127af80a25aba1fd7
Commit:     f19e8999a5631e3af0e1ca5127af80a25aba1fd7
Parent:     ee8f37688966ab1438d0cf42e0cb7c6595d9592c
Author:     David Brownell <dbrownell at users.sourceforge.net>
AuthorDate: Tue May 12 16:23:32 2009 -0700
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Fri Jun 5 17:49:58 2009 +0100

    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 at users.sourceforge.net>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/davinci_nand.c |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index cb5a05e..ba6940d 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -717,19 +717,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) {