aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2012-05-17 18:19:49 -0400
committerKukjin Kim <kgene.kim@samsung.com>2012-05-17 18:19:49 -0400
commitaba607d63c71ef9b185fc7cb9637ab70a2d88491 (patch)
treebd843281a854f69c677cb9f8af010de7cd7578d8 /arch/arm/mach-s3c64xx
parent4c8b20752893d58bc7b6489c0610951076b0fce8 (diff)
ARM: S3C64XX: use timekeeping wrapper on cpuidle
The timekeeping is computed from the cpuidle core if we set the .en_core_tk_irqen flag. Let's use it and remove the duplicated code. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Tested-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r--arch/arm/mach-s3c64xx/cpuidle.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach-s3c64xx/cpuidle.c
index 2750e5412cee..acb197ccf3f7 100644
--- a/arch/arm/mach-s3c64xx/cpuidle.c
+++ b/arch/arm/mach-s3c64xx/cpuidle.c
@@ -27,12 +27,7 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev,
27 struct cpuidle_driver *drv, 27 struct cpuidle_driver *drv,
28 int index) 28 int index)
29{ 29{
30 struct timeval before, after;
31 unsigned long tmp; 30 unsigned long tmp;
32 int idle_time;
33
34 local_irq_disable();
35 do_gettimeofday(&before);
36 31
37 /* Setup PWRCFG to enter idle mode */ 32 /* Setup PWRCFG to enter idle mode */
38 tmp = __raw_readl(S3C64XX_PWR_CFG); 33 tmp = __raw_readl(S3C64XX_PWR_CFG);
@@ -42,12 +37,6 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev,
42 37
43 cpu_do_idle(); 38 cpu_do_idle();
44 39
45 do_gettimeofday(&after);
46 local_irq_enable();
47 idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC +
48 (after.tv_usec - before.tv_usec);
49
50 dev->last_residency = idle_time;
51 return index; 40 return index;
52} 41}
53 42
@@ -56,6 +45,7 @@ static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device);
56static struct cpuidle_driver s3c64xx_cpuidle_driver = { 45static struct cpuidle_driver s3c64xx_cpuidle_driver = {
57 .name = "s3c64xx_cpuidle", 46 .name = "s3c64xx_cpuidle",
58 .owner = THIS_MODULE, 47 .owner = THIS_MODULE,
48 .en_core_tk_irqen = 1,
59 .states = { 49 .states = {
60 { 50 {
61 .enter = s3c64xx_enter_idle, 51 .enter = s3c64xx_enter_idle,