提交 7d2ab9ae 编写于 作者: K Kim Phillips 提交者: Tom Rini

drivers/mtd/nand: sparse fixes

nand_ecc.c:82:5: warning: symbol 'nand_calculate_ecc' was not declared. Should it be static?
nand_ecc.c:155:5: warning: symbol 'nand_correct_data' was not declared. Should it be static?
nand_base.c:2854:1: error: directive in argument list
nand_base.c:2856:1: error: directive in argument list
Signed-off-by: NKim Phillips <kim.phillips@freescale.com>
Acked-by: NScott Wood <scottwood@freescale.com>
上级 11dc4010
...@@ -2601,6 +2601,7 @@ static const struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, ...@@ -2601,6 +2601,7 @@ static const struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
int *maf_id, int *dev_id, int *maf_id, int *dev_id,
const struct nand_flash_dev *type) const struct nand_flash_dev *type)
{ {
const char *name;
int i, maf_idx; int i, maf_idx;
u8 id_data[8]; u8 id_data[8];
int ret; int ret;
...@@ -2848,14 +2849,14 @@ ident_done: ...@@ -2848,14 +2849,14 @@ ident_done:
chip->cmdfunc = nand_command_lp; chip->cmdfunc = nand_command_lp;
/* TODO onfi flash name */ /* TODO onfi flash name */
MTDDEBUG (MTD_DEBUG_LEVEL0, "NAND device: Manufacturer ID:" name = type->name;
" 0x%02x, Chip ID: 0x%02x (%s %s)\n", *maf_id, *dev_id,
nand_manuf_ids[maf_idx].name,
#ifdef CONFIG_SYS_NAND_ONFI_DETECTION #ifdef CONFIG_SYS_NAND_ONFI_DETECTION
chip->onfi_version ? chip->onfi_params.model : type->name); if (chip->onfi_version)
#else name = chip->onfi_params.model;
type->name);
#endif #endif
MTDDEBUG(MTD_DEBUG_LEVEL0, "NAND device: Manufacturer ID:"
" 0x%02x, Chip ID: 0x%02x (%s %s)\n", *maf_id, *dev_id,
nand_manuf_ids[maf_idx].name, name);
return type; return type;
} }
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <asm/errno.h> #include <asm/errno.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand_ecc.h>
/* The PPC4xx NDFC uses Smart Media (SMC) bytes order */ /* The PPC4xx NDFC uses Smart Media (SMC) bytes order */
#ifdef CONFIG_NAND_NDFC #ifdef CONFIG_NAND_NDFC
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册