mmc: omap: fix mmc_omap_report_irq to use dev_dbg macros

The function mmc_omap_report_irq uses raw printks and the actual output
was disabled by a static variable. Make the function use dev_vdbg macro
and use it under the standard CONFIG_MMC_DEBUG flag.

Signed-off-by: Venkatraman S <svenkatr@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 921cf3af8efe949eded459405aa22e2f343d4200..48ad361613efb2ebaca728ac53f87a147e8beb45 100644 (file)
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -687,22 +687,29 @@ mmc_omap_xfer_data(struct mmc_omap_host *host, int write)
        host->buffer += nwords;
 }
 
-static inline void mmc_omap_report_irq(u16 status)
+#ifdef CONFIG_MMC_DEBUG
+static void mmc_omap_report_irq(struct mmc_omap_host *host, u16 status)
 {
        static const char *mmc_omap_status_bits[] = {
                "EOC", "CD", "CB", "BRS", "EOFB", "DTO", "DCRC", "CTO",
                "CCRC", "CRW", "AF", "AE", "OCRB", "CIRQ", "CERR"
        };
-       int i, c = 0;
+       int i;
+       char res[64], *buf = res;
+
+       buf += sprintf(buf, "MMC IRQ 0x%x:", status);
 
        for (i = 0; i < ARRAY_SIZE(mmc_omap_status_bits); i++)
-               if (status & (1 << i)) {
-                       if (c)
-                               printk(" ");
-                       printk("%s", mmc_omap_status_bits[i]);
-                       c++;
-               }
+               if (status & (1 << i))
+                       buf += sprintf(buf, " %s", mmc_omap_status_bits[i]);
+       dev_vdbg(mmc_dev(host->mmc), "%s\n", res);
+}
+#else
+static void mmc_omap_report_irq(struct mmc_omap_host *host, u16 status)
+{
 }
+#endif
+
 
 static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
 {
@@ -736,12 +743,10 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
                        cmd = host->cmd->opcode;
                else
                        cmd = -1;
-#ifdef CONFIG_MMC_DEBUG
                dev_dbg(mmc_dev(host->mmc), "MMC IRQ %04x (CMD %d): ",
                        status, cmd);
-               mmc_omap_report_irq(status);
-               printk("\n");
-#endif
+               mmc_omap_report_irq(host, status);
+
                if (host->total_bytes_left) {
                        if ((status & OMAP_MMC_STAT_A_FULL) ||
                            (status & OMAP_MMC_STAT_END_OF_DATA))