[patch -mm 05/20] chardev: GPIO for SCx200 & PC-8736x: put gpio_dumpon a diet

[Jim Cromie]

5/20. patch.dump-diet

Shrink scx200_gpio_dump() to a single printk with ternary ops.  The
function is still ifdef'd out, this is corrected in next patch, when
it is actually used.

The patch 'inadvertently' changed loglevel from DEBUG to INFO.  This
is Good, because in next patch, its wired to a 'command' which the
user can invoke when they want.  When they do so, its because they
want INFO to support their developement effort, and we want to give it
to them without compiling a DEBUG version of the driver.

Signed-off-by: Jim Cromie <jim.cromie@xxxxxxxxx>

---

diffstat gpio-scx/patch.dump-diet
scx200.c |   39 +++++++++++----------------------------
1 files changed, 11 insertions(+), 28 deletions(-)

diff -ruNp -X dontdiff -X exclude-diffs ax-4/arch/i386/kernel/scx200.c ax-5/arch/i386/kernel/scx200.c
--- ax-4/arch/i386/kernel/scx200.c	2006-06-17 01:07:24.000000000 -0600
+++ ax-5/arch/i386/kernel/scx200.c	2006-06-17 01:10:02.000000000 -0600
@@ -108,34 +108,17 @@ u32 scx200_gpio_configure(unsigned index
#if 0
void scx200_gpio_dump(unsigned index)
{
-	u32 config = scx200_gpio_configure(index, ~0, 0);
-	printk(KERN_DEBUG "GPIO%02u: 0x%08lx", index, (unsigned long)config);
-	
-	if (config & 1) 
-		printk(" OE"); /* output enabled */
-	else
-		printk(" TS"); /* tristate */
-	if (config & 2) 
-		printk(" PP"); /* push pull */
-	else
-		printk(" OD"); /* open drain */
-	if (config & 4) 
-		printk(" PUE"); /* pull up enabled */
-	else
-		printk(" PUD"); /* pull up disabled */
-	if (config & 8) 
-		printk(" LOCKED"); /* locked */
-	if (config & 16) 
-		printk(" LEVEL"); /* level input */
-	else
-		printk(" EDGE"); /* edge input */
-	if (config & 32) 
-		printk(" HI"); /* trigger on rising edge */
-	else
-		printk(" LO"); /* trigger on falling edge */
-	if (config & 64) 
-		printk(" DEBOUNCE"); /* debounce */
-	printk("\n");
+        u32 config = scx200_gpio_configure(index, ~0, 0);
+
+        printk(KERN_INFO NAME ": GPIO-%02u: 0x%08lx %s %s %s %s %s %s %s\n",
+               index, (unsigned long) config,
+               (config & 1) ? "OE"      : "TS",		/* output enabled / tristate */
+               (config & 2) ? "PP"      : "OD",		/* push pull / open drain */
+               (config & 4) ? "PUE"     : "PUD",	/* pull up enabled/disabled */
+               (config & 8) ? "LOCKED"  : "",		/* locked / unlocked */
+               (config & 16) ? "LEVEL"  : "EDGE",	/* level/edge input */
+               (config & 32) ? "HI"     : "LO",		/* trigger on rising/falling edge */ 
+               (config & 64) ? "DEBOUNCE" : "");	/* debounce */
}
#endif  /*  0  */



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/