Thread (28 messages) 28 messages, 5 authors, 2011-05-06
DORMANTno replies

[PATCH 08/22] mmc: omap_hsmmc: correct debug report error status mnemonics

From: S, Venkatraman <hidden>
Date: 2011-05-06 08:35:44
Also in: linux-mmc, linux-omap

On Thu, May 5, 2011 at 5:21 PM, Adrian Hunter [off-list ref] wrote:
quoted hunk ↗ jump to hunk
CERR and BADA were in the wrong place and there are only
32 not 35.

Signed-off-by: Adrian Hunter <redacted>
---
?drivers/mmc/host/omap_hsmmc.c | ? 19 +++++++++++--------
?1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index bd52849..a1a1101 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -982,14 +982,14 @@ static void omap_hsmmc_dma_cleanup(struct omap_hsmmc_host *host, int errno)
?* Readable error output
?*/
?#ifdef CONFIG_MMC_DEBUG
-static void omap_hsmmc_report_irq(struct omap_hsmmc_host *host, u32 status)
+static void omap_hsmmc_dbg_report_irq(struct omap_hsmmc_host *host, u32 status)
?{
? ? ? ?/* --- means reserved bit without definition at documentation */
? ? ? ?static const char *omap_hsmmc_status_bits[] = {
- ? ? ? ? ? ? ? "CC", "TC", "BGE", "---", "BWR", "BRR", "---", "---", "CIRQ",
- ? ? ? ? ? ? ? "OBI", "---", "---", "---", "---", "---", "ERRI", "CTO", "CCRC",
- ? ? ? ? ? ? ? "CEB", "CIE", "DTO", "DCRC", "DEB", "---", "ACE", "---",
- ? ? ? ? ? ? ? "---", "---", "---", "CERR", "CERR", "BADA", "---", "---", "---"
+ ? ? ? ? ? ? ? "CC" ?, "TC" ?, "BGE", "---", "BWR" , "BRR" , "---" , "---" ,
+ ? ? ? ? ? ? ? "CIRQ", "OBI" , "---", "---", "---" , "---" , "---" , "ERRI",
+ ? ? ? ? ? ? ? "CTO" , "CCRC", "CEB", "CIE", "DTO" , "DCRC", "DEB" , "---" ,
+ ? ? ? ? ? ? ? "ACE" , "---" , "---", "---", "CERR", "BADA", "---" , "---"
? ? ? ?};
? ? ? ?char res[256];
? ? ? ?char *buf = res;
@@ -1006,6 +1006,11 @@ static void omap_hsmmc_report_irq(struct omap_hsmmc_host *host, u32 status)
? ? ? ?dev_dbg(mmc_dev(host->mmc), "%s\n", res);
?}
+#else
+static inline void omap_hsmmc_dbg_report_irq(struct omap_hsmmc_host *host,
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?u32 status)
+{
+}
?#endif ?/* CONFIG_MMC_DEBUG */

?/*
@@ -1064,9 +1069,7 @@ static void omap_hsmmc_do_irq(struct omap_hsmmc_host *host, int status)
? ? ? ?dev_dbg(mmc_dev(host->mmc), "IRQ Status is %x\n", status);

? ? ? ?if (status & ERR) {
-#ifdef CONFIG_MMC_DEBUG
- ? ? ? ? ? ? ? omap_hsmmc_report_irq(host, status);
-#endif
+ ? ? ? ? ? ? ? omap_hsmmc_dbg_report_irq(host, status);
? ? ? ? ? ? ? ?if ((status & CMD_TIMEOUT) ||
? ? ? ? ? ? ? ? ? ? ? ?(status & CMD_CRC)) {
? ? ? ? ? ? ? ? ? ? ? ?if (host->cmd) {
--
1.7.0.4
I checked against the TRM and you are right.
FWIW,
 Reviewed-by: Venkatraman S [off-list ref]
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help