This is a simple patch that cleans up the ppc4xx_pic debug output.
Signed-off-by: Geoff Levand <[email protected]> for CELF
---
ppc4xx_pic.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
--- linux-2.6.8.1.orig/arch/ppc/syslib/ppc4xx_pic.c 2004-08-14 03:54:46.000000000 -0700
+++ gpio-test/arch/ppc/syslib/ppc4xx_pic.c 2004-09-14 12:10:39.000000000 -0700
@@ -425,8 +428,9 @@
(irq <
ibm4xxPIC_NumInitSenses) ? ibm4xxPIC_InitSenses[irq] : 3;
#ifdef PPC4xx_PIC_DEBUG
- printk("PPC4xx_picext %d word:%x bit:%x sense:%x", irq, word,
- bit, sense);
+ printk("ppc4xx_extpic_init: "
+ "irq:%2.2d word:%x bit:%2.2x sense:%x ",
+ irq, word, bit, sense);
#endif
ppc_cached_sense_mask[word] |=
(~sense & IRQ_SENSE_MASK) << (31 - bit);
@@ -435,8 +439,8 @@
switch (word) {
case 0:
#ifdef PPC4xx_PIC_DEBUG
- printk("Pol %x ", mfdcr(DCRN_UIC_PR(UIC0)));
- printk("Level %x\n", mfdcr(DCRN_UIC_TR(UIC0)));
+ printk("pol:%8.8x ", mfdcr(DCRN_UIC_PR(UIC0)));
+ printk("level:%8.8x\n", mfdcr(DCRN_UIC_TR(UIC0)));
#endif
/* polarity setting */
mtdcr(DCRN_UIC_PR(UIC0), ppc_cached_pol_mask[word]);
@@ -447,8 +451,8 @@
break;
case 1:
#ifdef PPC4xx_PIC_DEBUG
- printk("Pol %x ", mfdcr(DCRN_UIC_PR(UIC1)));
- printk("Level %x\n", mfdcr(DCRN_UIC_TR(UIC1)));
+ printk("pol:%8.8x ", mfdcr(DCRN_UIC_PR(UIC1)));
+ printk("level:%8.8x\n", mfdcr(DCRN_UIC_TR(UIC1)));
#endif
/* polarity setting */
mtdcr(DCRN_UIC_PR(UIC1), ppc_cached_pol_mask[word]);
@@ -459,8 +463,8 @@
break;
case 2:
#ifdef PPC4xx_PIC_DEBUG
- printk("Pol %x ", mfdcr(DCRN_UIC_PR(UIC2)));
- printk("Level %x\n", mfdcr(DCRN_UIC_TR(UIC2)));
+ printk("pol:%8.8x ", mfdcr(DCRN_UIC_PR(UIC2)));
+ printk("level:%8.8x\n", mfdcr(DCRN_UIC_TR(UIC2)));
#endif
/* polarity setting */
mtdcr(DCRN_UIC_PR(UIC2), ppc_cached_pol_mask[word]);
-EOF