aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@nokia.com>2011-05-06 05:14:01 -0400
committerChris Ball <cjb@laptop.org>2011-07-21 10:35:01 -0400
commit699b958ba0608cde3b767d0d7445f080cc3fe975 (patch)
tree34d57e0363764b92b6b4107fe42b9eda03d9f289
parent393f9a08e2ee72e42379489a5781feaf9c406d5f (diff)
mmc: omap_hsmmc: correct debug report error status mnemonics
CERR and BADA were in the wrong place and there are only 32 not 35. Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> Reviewed-by: Venkatraman S <svenkatr@ti.com> Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r--drivers/mmc/host/omap_hsmmc.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 6416828d2cdc..274b6c3ce02a 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -975,14 +975,14 @@ static void omap_hsmmc_dma_cleanup(struct omap_hsmmc_host *host, int errno)
975 * Readable error output 975 * Readable error output
976 */ 976 */
977#ifdef CONFIG_MMC_DEBUG 977#ifdef CONFIG_MMC_DEBUG
978static void omap_hsmmc_report_irq(struct omap_hsmmc_host *host, u32 status) 978static void omap_hsmmc_dbg_report_irq(struct omap_hsmmc_host *host, u32 status)
979{ 979{
980 /* --- means reserved bit without definition at documentation */ 980 /* --- means reserved bit without definition at documentation */
981 static const char *omap_hsmmc_status_bits[] = { 981 static const char *omap_hsmmc_status_bits[] = {
982 "CC", "TC", "BGE", "---", "BWR", "BRR", "---", "---", "CIRQ", 982 "CC" , "TC" , "BGE", "---", "BWR" , "BRR" , "---" , "---" ,
983 "OBI", "---", "---", "---", "---", "---", "ERRI", "CTO", "CCRC", 983 "CIRQ", "OBI" , "---", "---", "---" , "---" , "---" , "ERRI",
984 "CEB", "CIE", "DTO", "DCRC", "DEB", "---", "ACE", "---", 984 "CTO" , "CCRC", "CEB", "CIE", "DTO" , "DCRC", "DEB" , "---" ,
985 "---", "---", "---", "CERR", "CERR", "BADA", "---", "---", "---" 985 "ACE" , "---" , "---", "---", "CERR", "BADA", "---" , "---"
986 }; 986 };
987 char res[256]; 987 char res[256];
988 char *buf = res; 988 char *buf = res;
@@ -999,6 +999,11 @@ static void omap_hsmmc_report_irq(struct omap_hsmmc_host *host, u32 status)
999 999
1000 dev_dbg(mmc_dev(host->mmc), "%s\n", res); 1000 dev_dbg(mmc_dev(host->mmc), "%s\n", res);
1001} 1001}
1002#else
1003static inline void omap_hsmmc_dbg_report_irq(struct omap_hsmmc_host *host,
1004 u32 status)
1005{
1006}
1002#endif /* CONFIG_MMC_DEBUG */ 1007#endif /* CONFIG_MMC_DEBUG */
1003 1008
1004/* 1009/*
@@ -1057,9 +1062,7 @@ static void omap_hsmmc_do_irq(struct omap_hsmmc_host *host, int status)
1057 dev_dbg(mmc_dev(host->mmc), "IRQ Status is %x\n", status); 1062 dev_dbg(mmc_dev(host->mmc), "IRQ Status is %x\n", status);
1058 1063
1059 if (status & ERR) { 1064 if (status & ERR) {
1060#ifdef CONFIG_MMC_DEBUG 1065 omap_hsmmc_dbg_report_irq(host, status);
1061 omap_hsmmc_report_irq(host, status);
1062#endif
1063 if ((status & CMD_TIMEOUT) || 1066 if ((status & CMD_TIMEOUT) ||
1064 (status & CMD_CRC)) { 1067 (status & CMD_CRC)) {
1065 if (host->cmd) { 1068 if (host->cmd) {