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>

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>
Daniel Lezcano · Rafael J. Wysocki
1 parent 0a4f841e9c
Showing 3 changed files with 11 additions and 7 deletions Side-by-side Diff
arch/sh/include/asm/suspend.h
arch/sh/kernel/cpu/shmobile/cpuidle.c
arch/sh/kernel/cpu/shmobile/pm.c
@@ -14,9 +14,9 @@
 void sh_mobile_call_standby(unsigned long mode);
  
 #ifdef CONFIG_CPU_IDLE
-void sh_mobile_setup_cpuidle(void);
+int sh_mobile_setup_cpuidle(void);
 #else
-static inline void sh_mobile_setup_cpuidle(void) {}
+static inline int sh_mobile_setup_cpuidle(void) { return 0; }
 #endif
  
 /* notifier chains for pre/post sleep hooks */
@@ -91,15 +91,20 @@
 	.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)
 		cpuidle_driver.states[1].disabled = false;
  
 	if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
 		cpuidle_driver.states[2].disabled = false;
  
-	if (!cpuidle_register_driver(&cpuidle_driver))
-		cpuidle_register_device(&cpuidle_dev);
+	ret = cpuidle_register_driver(&cpuidle_driver);
+	if (ret)
+		return ret;
+
+	return cpuidle_register_device(&cpuidle_dev);
 }
@@ -150,8 +150,7 @@
 static int __init sh_pm_init(void)
 {
 	suspend_set_ops(&sh_pm_ops);
-	sh_mobile_setup_cpuidle();
-	return 0;
+	return sh_mobile_setup_cpuidle();
 }
  
 late_initcall(sh_pm_init);
...	...	@@ -14,9 +14,9 @@
14	14	void sh_mobile_call_standby(unsigned long mode);
15	15
16	16	#ifdef CONFIG_CPU_IDLE
17		-void sh_mobile_setup_cpuidle(void);
	17	+int sh_mobile_setup_cpuidle(void);
18	18	#else
19		-static inline void sh_mobile_setup_cpuidle(void) {}
	19	+static inline int sh_mobile_setup_cpuidle(void) { return 0; }
20	20	#endif
21	21
22	22	/* notifier chains for pre/post sleep hooks */
...	...	@@ -91,15 +91,20 @@
91	91	.state_count = 3,
92	92	};
93	93
94		-void sh_mobile_setup_cpuidle(void)
	94	+int __init sh_mobile_setup_cpuidle(void)
95	95	{
	96	+ int ret;
	97	+
96	98	if (sh_mobile_sleep_supported & SUSP_SH_SF)
97	99	cpuidle_driver.states[1].disabled = false;
98	100
99	101	if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
100	102	cpuidle_driver.states[2].disabled = false;
101	103
102		- if (!cpuidle_register_driver(&cpuidle_driver))
103		- cpuidle_register_device(&cpuidle_dev);
	104	+ ret = cpuidle_register_driver(&cpuidle_driver);
	105	+ if (ret)
	106	+ return ret;
	107	+
	108	+ return cpuidle_register_device(&cpuidle_dev);
104	109	}
...	...	@@ -150,8 +150,7 @@
150	150	static int __init sh_pm_init(void)
151	151	{
152	152	suspend_set_ops(&sh_pm_ops);
153		- sh_mobile_setup_cpuidle();
154		- return 0;
	153	+ return sh_mobile_setup_cpuidle();
155	154	}
156	155
157	156	late_initcall(sh_pm_init);