2011-02-04 21:48:04

by Simon Horman

Subject: [PATCH] [patch v3] tmio_mmc: Improve readability of the output of pr_debug_status()

Cc: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Simon Horman <[email protected]>

---

v2: As suggested by Guennadi Liakhovetski
* Pass status and i as parameters to STATUS_TO_TEXT
* Pad "|" with spaces to further improve readability

v3: Actually include the v2 changes
* My git-foo bites again
---
drivers/mmc/host/tmio_mmc.h | 50 +++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index 6f724de..ddf79b0 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -235,36 +235,40 @@ static inline void tmio_mmc_kunmap_atomic(void *virt,

#ifdef CONFIG_MMC_DEBUG

-#define STATUS_TO_TEXT(a) \
+#define STATUS_TO_TEXT(a, status, i) \
do { \
- if (status & TMIO_STAT_##a) \
+ if (status & TMIO_STAT_##a) { \
+ if (i++) \
+ printk(" | "); \
printk(#a); \
+ } \
} while (0)

void pr_debug_status(u32 status)
{
+ int i = 0;
printk(KERN_DEBUG "status: %08x = ", status);
- STATUS_TO_TEXT(CARD_REMOVE);
- STATUS_TO_TEXT(CARD_INSERT);
- STATUS_TO_TEXT(SIGSTATE);
- STATUS_TO_TEXT(WRPROTECT);
- STATUS_TO_TEXT(CARD_REMOVE_A);
- STATUS_TO_TEXT(CARD_INSERT_A);
- STATUS_TO_TEXT(SIGSTATE_A);
- STATUS_TO_TEXT(CMD_IDX_ERR);
- STATUS_TO_TEXT(STOPBIT_ERR);
- STATUS_TO_TEXT(ILL_FUNC);
- STATUS_TO_TEXT(CMD_BUSY);
- STATUS_TO_TEXT(CMDRESPEND);
- STATUS_TO_TEXT(DATAEND);
- STATUS_TO_TEXT(CRCFAIL);
- STATUS_TO_TEXT(DATATIMEOUT);
- STATUS_TO_TEXT(CMDTIMEOUT);
- STATUS_TO_TEXT(RXOVERFLOW);
- STATUS_TO_TEXT(TXUNDERRUN);
- STATUS_TO_TEXT(RXRDY);
- STATUS_TO_TEXT(TXRQ);
- STATUS_TO_TEXT(ILL_ACCESS);
+ STATUS_TO_TEXT(CARD_REMOVE, status, i);
+ STATUS_TO_TEXT(CARD_INSERT, status, i);
+ STATUS_TO_TEXT(SIGSTATE, status, i);
+ STATUS_TO_TEXT(WRPROTECT, status, i);
+ STATUS_TO_TEXT(CARD_REMOVE_A, status, i);
+ STATUS_TO_TEXT(CARD_INSERT_A, status, i);
+ STATUS_TO_TEXT(SIGSTATE_A, status, i);
+ STATUS_TO_TEXT(CMD_IDX_ERR, status, i);
+ STATUS_TO_TEXT(STOPBIT_ERR, status, i);
+ STATUS_TO_TEXT(ILL_FUNC, status, i);
+ STATUS_TO_TEXT(CMD_BUSY, status, i);
+ STATUS_TO_TEXT(CMDRESPEND, status, i);
+ STATUS_TO_TEXT(DATAEND, status, i);
+ STATUS_TO_TEXT(CRCFAIL, status, i);
+ STATUS_TO_TEXT(DATATIMEOUT, status, i);
+ STATUS_TO_TEXT(CMDTIMEOUT, status, i);
+ STATUS_TO_TEXT(RXOVERFLOW, status, i);
+ STATUS_TO_TEXT(TXUNDERRUN, status, i);
+ STATUS_TO_TEXT(RXRDY, status, i);
+ STATUS_TO_TEXT(TXRQ, status, i);
+ STATUS_TO_TEXT(ILL_ACCESS, status, i);
printk("\n");
}

--
1.7.2.3

2011-02-08 04:06:04

by Chris Ball

Subject: Re: [PATCH] [patch v3] tmio_mmc: Improve readability of the output of pr_debug_status()

Hi Simon,

On Sat, Feb 05, 2011 at 06:47:56AM +0900, Simon Horman wrote:
> --- a/drivers/mmc/host/tmio_mmc.h
> +++ b/drivers/mmc/host/tmio_mmc.h

Mind rebasing against Linus' tree or mmc-next? Guennadi has merged
tmio_mmc.h into tmio_mmc.c there.

Once the patch applies, I'll merge it into mmc-next with a Reviewed-by:
line from Guennadi unless anyone objects.

Thanks,

--
Chris Ball <[email protected]> <http://printf.net/>
One Laptop Per Child

2011-02-08 05:00:35

by Simon Horman

Subject: Re: [PATCH] [patch v3] tmio_mmc: Improve readability of the output of pr_debug_status()

On Tue, Feb 08, 2011 at 04:05:58AM +0000, Chris Ball wrote:
> Hi Simon,
>
> On Sat, Feb 05, 2011 at 06:47:56AM +0900, Simon Horman wrote:
> > --- a/drivers/mmc/host/tmio_mmc.h
> > +++ b/drivers/mmc/host/tmio_mmc.h
>
> Mind rebasing against Linus' tree or mmc-next? Guennadi has merged
> tmio_mmc.h into tmio_mmc.c there.
>
> Once the patch applies, I'll merge it into mmc-next with a Reviewed-by:
> line from Guennadi unless anyone objects.

Sure, will do.