diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-04-29 20:24:39 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-05-09 18:16:41 +0200 |
| commit | e89e261365588035edd7c8b42a961c1e6c36a567 (patch) | |
| tree | 6131ec828c71ca4b791d23186135b2303527f5cc /arch/arm/mach-rpc | |
| parent | ARM: riscpc: fix lack of keyboard interrupts after irq conversion (diff) | |
| download | linux-e89e261365588035edd7c8b42a961c1e6c36a567.tar.xz linux-e89e261365588035edd7c8b42a961c1e6c36a567.zip | |
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>
Diffstat (limited to 'arch/arm/mach-rpc')
| -rw-r--r-- | arch/arm/mach-rpc/ecard.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c index 04b2f22c2739..3e7b81cc4274 100644 --- 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)); } } |