diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-07-25 18:14:04 -0400 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2013-08-12 05:28:18 -0400 |
commit | c78e43601b8f6d06bd92753e5f4ae51e4d6a1284 (patch) | |
tree | 11226dc643a983944ec425b36b21e2d060096735 | |
parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) |
SH: cpuidle: Add missing parameter for cpuidle_register()
arch/sh/kernel/cpu/shmobile/cpuidle.c: In function 'sh_mobile_setup_cpuidle':
arch/sh/kernel/cpu/shmobile/cpuidle.c:102:2: error: too few arguments to function 'cpuidle_register'
include/linux/cpuidle.h:129:12: note: declared here
arch/sh/kernel/cpu/shmobile/cpuidle.c:94:6: warning: unused variable 'ret' [-Wunused-variable]
Add the missing parameter, and remove the unused variable.
Both introduced by commit b181a3b03f866776211f22390c185c4da1dc45ff ("SH:
cpuidle: use init/exit common routine").
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-rw-r--r-- | arch/sh/kernel/cpu/shmobile/cpuidle.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c index d30622592116..e3abfd4277e2 100644 --- a/arch/sh/kernel/cpu/shmobile/cpuidle.c +++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c | |||
@@ -91,13 +91,11 @@ static struct cpuidle_driver cpuidle_driver = { | |||
91 | 91 | ||
92 | int __init sh_mobile_setup_cpuidle(void) | 92 | int __init sh_mobile_setup_cpuidle(void) |
93 | { | 93 | { |
94 | int ret; | ||
95 | |||
96 | if (sh_mobile_sleep_supported & SUSP_SH_SF) | 94 | if (sh_mobile_sleep_supported & SUSP_SH_SF) |
97 | cpuidle_driver.states[1].disabled = false; | 95 | cpuidle_driver.states[1].disabled = false; |
98 | 96 | ||
99 | if (sh_mobile_sleep_supported & SUSP_SH_STANDBY) | 97 | if (sh_mobile_sleep_supported & SUSP_SH_STANDBY) |
100 | cpuidle_driver.states[2].disabled = false; | 98 | cpuidle_driver.states[2].disabled = false; |
101 | 99 | ||
102 | return cpuidle_register(&cpuidle_driver); | 100 | return cpuidle_register(&cpuidle_driver, NULL); |
103 | } | 101 | } |