[PATCH] SH: cpuidle: Add missing parameter for cpuidle_register()

[PATCH] SH: cpuidle: Add missing parameter for cpuidle_register()

[Geert Uytterhoeven]

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>
---
 arch/sh/kernel/cpu/shmobile/cpuidle.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c
index d306225..e3abfd4 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 = {
 
 int __init sh_mobile_setup_cpuidle(void)
 {
-	int ret;
-
 	if (sh_mobile_sleep_supported & SUSP_SH_SF)
 		cpuidle_driver.states[1].disabled = false;
 
 	if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
 		cpuidle_driver.states[2].disabled = false;
 
-	return cpuidle_register(&cpuidle_driver);
+	return cpuidle_register(&cpuidle_driver, NULL);
 }
-- 
1.7.9.5

Re: [PATCH] SH: cpuidle: Add missing parameter for cpuidle_register()

[Daniel Lezcano]

On 07/26/2013 12:14 AM, Geert Uytterhoeven wrote:
> 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>
> ---

Thanks for the fix.

Applied to my tree.

>  arch/sh/kernel/cpu/shmobile/cpuidle.c |    4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c
> index d306225..e3abfd4 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 = {
>  
>  int __init sh_mobile_setup_cpuidle(void)
>  {
> -	int ret;
> -
>  	if (sh_mobile_sleep_supported & SUSP_SH_SF)
>  		cpuidle_driver.states[1].disabled = false;
>  
>  	if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
>  		cpuidle_driver.states[2].disabled = false;
>  
> -	return cpuidle_register(&cpuidle_driver);
> +	return cpuidle_register(&cpuidle_driver, NULL);
>  }
> 


-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog