diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-07-26 02:54:26 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-09-12 04:57:10 -0400 |
commit | 7852ec0536ca39cefffc6301dc77f8ae55592926 (patch) | |
tree | faa867a05d6571d5027b3fbfdf452678b3d35d38 /arch/arm/mach-omap2/irq.c | |
parent | a032d33b65c89a781c871fd1def595fa6a69b52a (diff) |
ARM: OMAP: unwrap strings
Find and unwrap wrapped strings in the style:
pr_debug("clockdomain: hardware cannot set/clear wake up of "
"%s when %s wakes up\n", clkdm1->name, clkdm2->name);
Keeping these strings contiguous seems to be the current Linux kernel
policy.
The offending lines were found with the following command:
pcregrep -rnM '"\s*$\s*"' arch/arm/*omap*
While here, some messages have been clarified, some pr_warning(
... calls have been converted to pr_warn( ..., and some printk(KERN_*
... have been converted to pr_*.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/irq.c')
-rw-r--r-- | arch/arm/mach-omap2/irq.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index bcd83db41bbc..a4dd4cf289f6 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
@@ -107,9 +107,8 @@ static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) | |||
107 | unsigned long tmp; | 107 | unsigned long tmp; |
108 | 108 | ||
109 | tmp = intc_bank_read_reg(bank, INTC_REVISION) & 0xff; | 109 | tmp = intc_bank_read_reg(bank, INTC_REVISION) & 0xff; |
110 | printk(KERN_INFO "IRQ: Found an INTC at 0x%p " | 110 | pr_info("IRQ: Found an INTC at 0x%p (revision %ld.%ld) with %d interrupts\n", |
111 | "(revision %ld.%ld) with %d interrupts\n", | 111 | bank->base_reg, tmp >> 4, tmp & 0xf, bank->nr_irqs); |
112 | bank->base_reg, tmp >> 4, tmp & 0xf, bank->nr_irqs); | ||
113 | 112 | ||
114 | tmp = intc_bank_read_reg(bank, INTC_SYSCONFIG); | 113 | tmp = intc_bank_read_reg(bank, INTC_SYSCONFIG); |
115 | tmp |= 1 << 1; /* soft reset */ | 114 | tmp |= 1 << 1; /* soft reset */ |