diff options
author | Tony Lindgren <tony@atomide.com> | 2012-09-12 23:42:36 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-09-12 23:42:36 -0400 |
commit | 3c101c41fbe5daf88afbbd575542aa1d047812bb (patch) | |
tree | 97b8837a7ef888f07d01ff7109303402dd8fed2e /arch/arm/mach-omap2/irq.c | |
parent | f191f40c1819ffdca05408e6349f7fd30ef1cc36 (diff) | |
parent | 7852ec0536ca39cefffc6301dc77f8ae55592926 (diff) |
Merge tag 'omap-cleanup-b-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into cleanup-makefile-sparse
smatch and string-wrapping cleanups for the OMAP subarch code.
These changes fix some of the more meaningful warnings that smatch
returns for the OMAP subarch code, and unwraps strings that are
wrapped at the 80-column boundary, to conform with the current
practice.
Basic build, boot, and PM logs are available here:
http://www.pwsan.com/omap/testlogs/warnings_a_cleanup_3.7/20120912025927/
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 efed4f540adb..3926f370448f 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
@@ -108,9 +108,8 @@ static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) | |||
108 | unsigned long tmp; | 108 | unsigned long tmp; |
109 | 109 | ||
110 | tmp = intc_bank_read_reg(bank, INTC_REVISION) & 0xff; | 110 | tmp = intc_bank_read_reg(bank, INTC_REVISION) & 0xff; |
111 | printk(KERN_INFO "IRQ: Found an INTC at 0x%p " | 111 | pr_info("IRQ: Found an INTC at 0x%p (revision %ld.%ld) with %d interrupts\n", |
112 | "(revision %ld.%ld) with %d interrupts\n", | 112 | bank->base_reg, tmp >> 4, tmp & 0xf, bank->nr_irqs); |
113 | bank->base_reg, tmp >> 4, tmp & 0xf, bank->nr_irqs); | ||
114 | 113 | ||
115 | tmp = intc_bank_read_reg(bank, INTC_SYSCONFIG); | 114 | tmp = intc_bank_read_reg(bank, INTC_SYSCONFIG); |
116 | tmp |= 1 << 1; /* soft reset */ | 115 | tmp |= 1 << 1; /* soft reset */ |