[U-Boot-Users] [PATCH] Cleanup nand_info[] declaration.

Stelian Pop stelian at popies.net
Tue May 13 17:31:24 CEST 2008


The nand_info array is declared as extern in several .c files.
Those days, nand.h contains a reference to the array, so there is
no need to declare it elsewhere.

Signed-off-by: Stelian Pop <stelian at popies.net>
---
 common/cmd_nand.c      |    2 --
 common/env_nand.c      |    3 ---
 common/lcd.c           |    1 -
 fs/jffs2/jffs2_1pass.c |    3 ---
 4 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 37eb41b..37198d2 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -37,8 +37,6 @@ int find_dev_and_part(const char *id, struct mtd_device **dev,
 		u8 *part_num, struct part_info **part);
 #endif
 
-extern nand_info_t nand_info[];       /* info for NAND chips */
-
 static int nand_dump_oob(nand_info_t *nand, ulong off)
 {
 	return 0;
diff --git a/common/env_nand.c b/common/env_nand.c
index 49742f5..f12674d 100644
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -57,9 +57,6 @@ int nand_legacy_rw (struct nand_chip* nand, int cmd,
 	    size_t start, size_t len,
 	    size_t * retlen, u_char * buf);
 
-/* info for NAND chips, defined in drivers/mtd/nand/nand.c */
-extern nand_info_t nand_info[];
-
 /* references to names in env_common.c */
 extern uchar default_environment[];
 extern int default_environment_size;
diff --git a/common/lcd.c b/common/lcd.c
index 2178f12..ebf377a 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -53,7 +53,6 @@
 #if defined(CONFIG_ATMEL_LCD)
 #include <atmel_lcdc.h>
 #include <nand.h>
-extern nand_info_t nand_info[];
 #endif
 
 #ifdef CONFIG_LCD
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index a330438..8630334 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -164,9 +164,6 @@ static struct part_info *current_part;
 /* this one defined in nand_legacy.c */
 int read_jffs2_nand(size_t start, size_t len,
 		size_t * retlen, u_char * buf, int nanddev);
-#else
-/* info for NAND chips, defined in drivers/mtd/nand/nand.c */
-extern nand_info_t nand_info[];
 #endif
 
 #define NAND_PAGE_SIZE 512
-- 
1.5.3.3





More information about the U-Boot mailing list