diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-24 01:15:11 +0200 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-24 01:15:11 +0200 |
| commit | 2910f14584eddf2bc0db4baec3c6950ef357b52c (patch) | |
| tree | 7396768abc8e9dfcf45e9376ac7405c6ae36339c /arch/arm/mach-omap2/timer.c | |
| parent | Linux 3.6-rc6 (diff) | |
| parent | ARM: OMAP: unwrap strings (diff) | |
| download | linux-2910f14584eddf2bc0db4baec3c6950ef357b52c.tar.xz linux-2910f14584eddf2bc0db4baec3c6950ef357b52c.zip | |
Merge tag 'omap-cleanup-b-for-3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7
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/timer.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 2ba4f57dda86..e04d58c0f811 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -211,7 +211,7 @@ static void __init omap2_gp_clockevent_init(int gptimer_id, res = omap_dm_timer_init_one(&clkev, gptimer_id, fck_source); BUG_ON(res); - omap2_gp_timer_irq.dev_id = (void *)&clkev; + omap2_gp_timer_irq.dev_id = &clkev; setup_irq(clkev.irq, &omap2_gp_timer_irq); __omap_dm_timer_int_enable(&clkev, OMAP_TIMER_INT_OVERFLOW); |