SH: cpuidle: use init/exit common routine

Remove the duplicated code and use the cpuidle common code for initialization. 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: use init/exit common routine
Remove the duplicated code and use the cpuidle common code for initialization. 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 1c192d047a
Showing 1 changed file with 1 additions and 6 deletions Side-by-side Diff
arch/sh/kernel/cpu/shmobile/cpuidle.c
@@ -51,7 +51,6 @@
 	return k;
 }
  
-static struct cpuidle_device cpuidle_dev;
 static struct cpuidle_driver cpuidle_driver = {
 	.name   = "sh_idle",
 	.owner  = THIS_MODULE,
@@ -100,10 +99,6 @@
 	if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
 		cpuidle_driver.states[2].disabled = false;
  
-	ret = cpuidle_register_driver(&cpuidle_driver);
-	if (ret)
-		return ret;
-
-	return cpuidle_register_device(&cpuidle_dev);
+	return cpuidle_register(&cpuidle_driver);
 }
...	...	@@ -51,7 +51,6 @@
51	51	return k;
52	52	}
53	53
54		-static struct cpuidle_device cpuidle_dev;
55	54	static struct cpuidle_driver cpuidle_driver = {
56	55	.name = "sh_idle",
57	56	.owner = THIS_MODULE,
...	...	@@ -100,10 +99,6 @@
100	99	if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
101	100	cpuidle_driver.states[2].disabled = false;
102	101
103		- ret = cpuidle_register_driver(&cpuidle_driver);
104		- if (ret)
105		- return ret;
106		-
107		- return cpuidle_register_device(&cpuidle_dev);
	102	+ return cpuidle_register(&cpuidle_driver);
108	103	}