summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2013-04-23 10:54:38 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-04-23 13:45:22 +0200
commit3cf4bc36f534550cfd4b0902e1a0408aded33a66 (patch)
tree8473a07bfe498f3a60578f7478919ea2450e6e09 /arch
parentARM: tegra: cpuidle: use init/exit common routine (diff)
downloadlinux-3cf4bc36f534550cfd4b0902e1a0408aded33a66.tar.xz
linux-3cf4bc36f534550cfd4b0902e1a0408aded33a66.zip
ARM: shmobile: 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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-shmobile/cpuidle.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-shmobile/cpuidle.c b/arch/arm/mach-shmobile/cpuidle.c
index d671ae90c7a7..0afeb5c7061c 100644
--- a/arch/arm/mach-shmobile/cpuidle.c
+++ b/arch/arm/mach-shmobile/cpuidle.c
@@ -16,7 +16,6 @@
#include <asm/cpuidle.h>
#include <asm/io.h>
-static struct cpuidle_device shmobile_cpuidle_dev;
static struct cpuidle_driver shmobile_cpuidle_default_driver = {
.name = "shmobile_cpuidle",
.owner = THIS_MODULE,
@@ -34,12 +33,5 @@ void __init shmobile_cpuidle_set_driver(struct cpuidle_driver *drv)
int __init shmobile_cpuidle_init(void)
{
- struct cpuidle_device *dev = &shmobile_cpuidle_dev;
-
- cpuidle_register_driver(cpuidle_drv);
-
- dev->state_count = cpuidle_drv->state_count;
- cpuidle_register_device(dev);
-
- return 0;
+ return cpuidle_register(cpuidle_drv, NULL);
}