diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-04-13 08:34:32 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-04-17 17:50:47 -0400 |
commit | eeb3711b89d68e147e05e7b43a49ecc5009dc157 (patch) | |
tree | 1ab372484bc29489a298917d0c709e676d534d69 /arch/arm/mach-omap2/pm34xx.c | |
parent | 31cde0447d779c1b4ae9feb51dc917d6e287de2b (diff) |
ARM: OMAP2+: clean up some cppcheck warnings
Resolve some warnings identified by cppcheck in arch/arm/mach-omap2:
[arch/arm/mach-omap2/usb-tusb6010.c:129]: (style) Checking if unsigned variable 'tmp' is less than zero.
[arch/arm/mach-omap2/prm_common.c:241]: (error) Possible null pointer dereference: irq_setup - otherwise it is redundant to check if irq_setup is null at line 247
[arch/arm/mach-omap2/pm34xx.c:790]: (style) Variable 'per_clkdm' is assigned a value that is never used
[arch/arm/mach-omap2/pm34xx.c:790]: (style) Variable 'core_clkdm' is assigned a value that is never used
[arch/arm/mach-omap2/pm24xx.c:185]: (style) Variable 'only_idle' is assigned a value that is never used
[arch/arm/mach-omap2/mux.c:254]: (error) Possible null pointer dereference: mux
[arch/arm/mach-omap2/mux.c:258]: (error) Possible null pointer dereference: mux
[arch/arm/mach-omap2/gpmc-onenand.c:178]: (style) Variable 'tick_ns' is assigned a value that is never used
[arch/arm/mach-omap2/gpio.c:56]: (error) Possible null pointer dereference: pdata - otherwise it is redundant to check if pdata is null at line 57
[arch/arm/mach-omap2/devices.c:45]: (style) Variable 'l' is assigned a value that is never used
[arch/arm/mach-omap2/board-omap3evm.c:641] -> [arch/arm/mach-omap2/board-omap3evm.c:639]: (style) Found duplicate branches for if and else.
[arch/arm/mach-omap2/am35xx-emac.c:95]: (style) Variable 'regval' is assigned a value that is never used
[arch/arm/mach-omap2/devices.c:74]: (style) Variable 'l' is assigned a value that is never used
[arch/arm/mach-omap2/pm34xx.c:277]: (style) Variable 'per_prev_state' is assigned a value that is never used
[arch/arm/plat-omap/dmtimer.c:352]: (error) Possible null pointer dereference: timer - otherwise it is redundant to check if timer is null at line 354
[arch/arm/plat-omap/omap_device.c:478]: (style) Variable 'c' is assigned a value that is never used
[arch/arm/plat-omap/usb.c:42]: (style) Variable 'status' is assigned a value that is never used
[arch/arm/mach-omap1/clock.c:197]: (style) Variable 'dpll1_rate' is assigned a value that is never used
[arch/arm/mach-omap1/lcd_dma.c:60]: (style) struct or union member 'lcd_dma_info::size' is never used
[arch/arm/mach-omap1/pm.c:572]: (style) Variable 'entry' is assigned a value that is never used
Some of them are pretty good catches, such as gpio.c:56 and
usb-tusb6010.c:129.
Thanks to Jarkko Nikula for some comments on the sscanf() warnings.
It seems that the kernel sscanf() ignores the field width anyway for the
%d format, so those changes have been dropped from this second version.
Thanks to Daniel Marjamäki <daniel.marjamaki@gmail.com> for pointing
out that a variable was unnecessarily marked static in the
board-omap3evm.c change.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>
Cc: Charulatha Varadarajan <charu@ti.com>
Cc: Daniel Marjamäki <daniel.marjamaki@gmail.com>
Cc: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Reviewed-by: Charulatha Varadarajan <charu@ti.com> # for gpio.c
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
-rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 703bd1099259..8b43aefba0ea 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -273,7 +273,7 @@ void omap_sram_idle(void) | |||
273 | int per_next_state = PWRDM_POWER_ON; | 273 | int per_next_state = PWRDM_POWER_ON; |
274 | int core_next_state = PWRDM_POWER_ON; | 274 | int core_next_state = PWRDM_POWER_ON; |
275 | int per_going_off; | 275 | int per_going_off; |
276 | int core_prev_state, per_prev_state; | 276 | int core_prev_state; |
277 | u32 sdrc_pwr = 0; | 277 | u32 sdrc_pwr = 0; |
278 | 278 | ||
279 | mpu_next_state = pwrdm_read_next_pwrst(mpu_pwrdm); | 279 | mpu_next_state = pwrdm_read_next_pwrst(mpu_pwrdm); |
@@ -375,10 +375,8 @@ void omap_sram_idle(void) | |||
375 | pwrdm_post_transition(); | 375 | pwrdm_post_transition(); |
376 | 376 | ||
377 | /* PER */ | 377 | /* PER */ |
378 | if (per_next_state < PWRDM_POWER_ON) { | 378 | if (per_next_state < PWRDM_POWER_ON) |
379 | per_prev_state = pwrdm_read_prev_pwrst(per_pwrdm); | ||
380 | omap2_gpio_resume_after_idle(); | 379 | omap2_gpio_resume_after_idle(); |
381 | } | ||
382 | 380 | ||
383 | /* Disable IO-PAD and IO-CHAIN wakeup */ | 381 | /* Disable IO-PAD and IO-CHAIN wakeup */ |
384 | if (omap3_has_io_wakeup() && | 382 | if (omap3_has_io_wakeup() && |
@@ -702,7 +700,7 @@ static void __init pm_errata_configure(void) | |||
702 | static int __init omap3_pm_init(void) | 700 | static int __init omap3_pm_init(void) |
703 | { | 701 | { |
704 | struct power_state *pwrst, *tmp; | 702 | struct power_state *pwrst, *tmp; |
705 | struct clockdomain *neon_clkdm, *per_clkdm, *mpu_clkdm, *core_clkdm; | 703 | struct clockdomain *neon_clkdm, *mpu_clkdm; |
706 | int ret; | 704 | int ret; |
707 | 705 | ||
708 | if (!cpu_is_omap34xx()) | 706 | if (!cpu_is_omap34xx()) |
@@ -757,8 +755,6 @@ static int __init omap3_pm_init(void) | |||
757 | 755 | ||
758 | neon_clkdm = clkdm_lookup("neon_clkdm"); | 756 | neon_clkdm = clkdm_lookup("neon_clkdm"); |
759 | mpu_clkdm = clkdm_lookup("mpu_clkdm"); | 757 | mpu_clkdm = clkdm_lookup("mpu_clkdm"); |
760 | per_clkdm = clkdm_lookup("per_clkdm"); | ||
761 | core_clkdm = clkdm_lookup("core_clkdm"); | ||
762 | 758 | ||
763 | #ifdef CONFIG_SUSPEND | 759 | #ifdef CONFIG_SUSPEND |
764 | omap_pm_suspend = omap3_pm_suspend; | 760 | omap_pm_suspend = omap3_pm_suspend; |