hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SH: cpuidle: check error code at init 

Registering the driver, or the device, can fail, let's check the return code
and return the error code to the PM layer.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Daniel Lezcano 2013-04-17 13:32:57 +00:00 committed by Rafael J. Wysocki
parent 0a4f841e9c
commit 38a94f4169
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sh/include/asm/suspend.h
View File

@ -14,9 +14,9 @@ struct swsusp_arch_regs {
void sh_mobile_call_standby(unsigned long mode); void sh_mobile_call_standby(unsigned long mode);
#ifdef CONFIG_CPU_IDLE #ifdef CONFIG_CPU_IDLE
void sh_mobile_setup_cpuidle(void); int sh_mobile_setup_cpuidle(void);
#else #else
static inline void sh_mobile_setup_cpuidle(void) {} static inline int sh_mobile_setup_cpuidle(void) { return 0; }
#endif #endif
/* notifier chains for pre/post sleep hooks */ /* notifier chains for pre/post sleep hooks */

11
arch/sh/kernel/cpu/shmobile/cpuidle.c
View File

@ -91,14 +91,19 @@ static struct cpuidle_driver cpuidle_driver = {
.state_count = 3, .state_count = 3,
}; };
void sh_mobile_setup_cpuidle(void) int __init sh_mobile_setup_cpuidle(void)
{ {
int ret;
if (sh_mobile_sleep_supported & SUSP_SH_SF) if (sh_mobile_sleep_supported & SUSP_SH_SF)
cpuidle_driver.states[1].disabled = false; cpuidle_driver.states[1].disabled = false;
if (sh_mobile_sleep_supported & SUSP_SH_STANDBY) if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
cpuidle_driver.states[2].disabled = false; cpuidle_driver.states[2].disabled = false;
if (!cpuidle_register_driver(&cpuidle_driver)) ret = cpuidle_register_driver(&cpuidle_driver);
cpuidle_register_device(&cpuidle_dev); if (ret)
return ret;
return cpuidle_register_device(&cpuidle_dev);
} }

3
arch/sh/kernel/cpu/shmobile/pm.c
View File

@ -150,8 +150,7 @@ static const struct platform_suspend_ops sh_pm_ops = {
static int __init sh_pm_init(void) static int __init sh_pm_init(void)
{ {
suspend_set_ops(&sh_pm_ops); suspend_set_ops(&sh_pm_ops);
sh_mobile_setup_cpuidle(); return sh_mobile_setup_cpuidle();
return 0;
} }
late_initcall(sh_pm_init); late_initcall(sh_pm_init);