From: Venkatraman S <svenkatr@ti.com>
To: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org
Cc: cjb@laptop.org, balajitk@ti.com, vishp@ti.com,
Venkatraman S <svenkatr@ti.com>
Subject: [PATCH 04/10] mmc: omap: fix mmc_omap_report_irq to use dev_dbg macros
Date: Sat, 18 Aug 2012 00:22:24 +0530 [thread overview]
Message-ID: <1345229550-8672-5-git-send-email-svenkatr@ti.com> (raw)
In-Reply-To: <1345229550-8672-1-git-send-email-svenkatr@ti.com>
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>
---
drivers/mmc/host/omap.c | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 0ec4e55..614f63c 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -679,22 +679,29 @@ mmc_omap_xfer_data(struct mmc_omap_host *host, int write)
}
}
-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)
{
@@ -728,12 +735,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))
--
1.7.11.1.25.g0e18bef
next prev parent reply other threads:[~2012-08-17 18:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-17 18:52 [PATCH 00/10] Assorted MMC / OMAP HSMMC patches Venkatraman S
2012-08-17 18:52 ` [PATCH 01/10] mmc: core: Add TRANsfer state to non-HPI state Venkatraman S
2012-08-17 18:52 ` [PATCH 02/10] mmc: debugfs: Print ext_csd in ascending order Venkatraman S
2012-08-17 18:52 ` [PATCH 03/10] mmc: omap: remove unused variables and includes Venkatraman S
2012-08-17 18:52 ` Venkatraman S [this message]
2012-08-17 18:52 ` [PATCH 05/10] mmc: omap_hsmmc: remove unused vars " Venkatraman S
2012-08-17 18:52 ` [PATCH 06/10] mmc: omap_hsmmc: remove access to SYSCONFIG register Venkatraman S
2012-08-21 15:38 ` Shubhrajyoti Datta
2012-08-27 11:04 ` S, Venkatraman
2012-08-17 18:52 ` [PATCH 07/10] mmc: omap_hsmmc: consolidate flush posted writes for HSMMC IRQs Venkatraman S
2012-08-21 15:21 ` T Krishnamoorthy, Balaji
2012-08-27 11:02 ` S, Venkatraman
2012-08-17 18:52 ` [PATCH 08/10] mmc: omap_hsmmc: consolidate error report handling of HSMMC IRQ Venkatraman S
2012-08-17 18:52 ` [PATCH 09/10] mmc: omap_hsmmc: convert from IP timer to hrtimer Venkatraman S
2012-08-21 10:42 ` Felipe Balbi
2012-08-22 10:38 ` S, Venkatraman
2012-08-22 11:28 ` Felipe Balbi
2012-08-17 18:52 ` [PATCH 10/10] mmc: omap_hsmmc: Move to Maintained state in MAINTAINERS Venkatraman S
2012-08-21 10:43 ` [PATCH 00/10] Assorted MMC / OMAP HSMMC patches Felipe Balbi
2012-08-27 23:02 ` Chris Ball
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345229550-8672-5-git-send-email-svenkatr@ti.com \
--to=svenkatr@ti.com \
--cc=balajitk@ti.com \
--cc=cjb@laptop.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=vishp@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox