ARM: riscpc: fix ecard printing

Multiple printk() statements appear to get broken into separate lines,
which messes up the formatting.  Fix these up.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c
index 04b2f22c2739abeb414708be209736ea6a571989..3e7b81cc427404c1f2581e394cc5fb6e6dac45a8 100644 (file)
--- a/arch/arm/mach-rpc/ecard.c
+++ b/arch/arm/mach-rpc/ecard.c
@@ -496,18 +496,21 @@ static void ecard_dump_irq_state(void)
        printk("Expansion card IRQ state:\n");
 
        for (ec = cards; ec; ec = ec->next) {
+               const char *claimed;
+
                if (ec->slot_no == 8)
                        continue;
 
-               printk("  %d: %sclaimed, ",
-                      ec->slot_no, ec->claimed ? "" : "not ");
+               claimed = ec->claimed ? "" : "not ";
 
                if (ec->ops && ec->ops->irqpending &&
                    ec->ops != &ecard_default_ops)
-                       printk("irq %spending\n",
+                       printk("  %d: %sclaimed irq %spending\n",
+                              ec->slot_no, claimed,
                               ec->ops->irqpending(ec) ? "" : "not ");
                else
-                       printk("irqaddr %p, mask = %02X, status = %02X\n",
+                       printk("  %d: %sclaimed irqaddr %p, mask = %02X, status = %02X\n",
+                              ec->slot_no, claimed,
                               ec->irqaddr, ec->irqmask, readb(ec->irqaddr));
        }
 }