diff options
author | Adrian Hunter <ext-adrian.hunter@nokia.com> | 2008-11-12 09:06:40 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-12-10 08:35:19 -0500 |
commit | 9359ea461b382de3249469d2165da45f4762b910 (patch) | |
tree | e4f2e691e7b154c5461f5d5cc99f232f48516370 | |
parent | 4f8f3af20ac5a1e58b419a98dfe76522885b5355 (diff) |
MTD: nandsim: suppress unnecessary warning
nand_base sometimes reads only 2 bytes of a 4 byte id.
It is OK. Do not print a warning in that case.
Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r-- | drivers/mtd/nand/nandsim.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index ae7c57781a68..fdf82cf24449 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c | |||
@@ -1736,13 +1736,17 @@ static void ns_nand_write_byte(struct mtd_info *mtd, u_char byte) | |||
1736 | 1736 | ||
1737 | /* Check if chip is expecting command */ | 1737 | /* Check if chip is expecting command */ |
1738 | if (NS_STATE(ns->nxstate) != STATE_UNKNOWN && !(ns->nxstate & STATE_CMD_MASK)) { | 1738 | if (NS_STATE(ns->nxstate) != STATE_UNKNOWN && !(ns->nxstate & STATE_CMD_MASK)) { |
1739 | /* | 1739 | /* Do not warn if only 2 id bytes are read */ |
1740 | * We are in situation when something else (not command) | 1740 | if (!(ns->regs.command == NAND_CMD_READID && |
1741 | * was expected but command was input. In this case ignore | 1741 | NS_STATE(ns->state) == STATE_DATAOUT_ID && ns->regs.count == 2)) { |
1742 | * previous command(s)/state(s) and accept the last one. | 1742 | /* |
1743 | */ | 1743 | * We are in situation when something else (not command) |
1744 | NS_WARN("write_byte: command (%#x) wasn't expected, expected state is %s, " | 1744 | * was expected but command was input. In this case ignore |
1745 | "ignore previous states\n", (uint)byte, get_state_name(ns->nxstate)); | 1745 | * previous command(s)/state(s) and accept the last one. |
1746 | */ | ||
1747 | NS_WARN("write_byte: command (%#x) wasn't expected, expected state is %s, " | ||
1748 | "ignore previous states\n", (uint)byte, get_state_name(ns->nxstate)); | ||
1749 | } | ||
1746 | switch_to_ready_state(ns, NS_STATUS_FAILED(ns)); | 1750 | switch_to_ready_state(ns, NS_STATUS_FAILED(ns)); |
1747 | } | 1751 | } |
1748 | 1752 | ||