Merge branch 'next/cleanup-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into late/cleanup

* 'next/cleanup-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C64XX: use timekeeping wrapper on cpuidle
  ARM: S3C64XX: declare the states with the new api on cpuidle

1 files changed, 15 insertions, 30 deletions

diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach-s3c64xx/cpuidle.c
index 179460f38db7..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,
                               struct cpuidle_driver *drv,
                               int index)
 {
-        struct timeval before, after;
         unsigned long tmp;
-        int idle_time;
-
-        local_irq_disable();
-        do_gettimeofday(&before);
 
         /* Setup PWRCFG to enter idle mode */
         tmp = __raw_readl(S3C64XX_PWR_CFG);
@@ -42,42 +37,32 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev,
 
         cpu_do_idle();
 
-        do_gettimeofday(&after);
-        local_irq_enable();
-        idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC +
-                    (after.tv_usec - before.tv_usec);
-
-        dev->last_residency = idle_time;
         return index;
 }
 
-static struct cpuidle_state s3c64xx_cpuidle_set[] = {
-        [0] = {
-                .enter                  = s3c64xx_enter_idle,
-                .exit_latency           = 1,
-                .target_residency       = 1,
-                .flags                  = CPUIDLE_FLAG_TIME_VALID,
-                .name                   = "IDLE",
-                .desc                   = "System active, ARM gated",
-        },
-};
+static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device);
 
 static struct cpuidle_driver s3c64xx_cpuidle_driver = {
-        .name           = "s3c64xx_cpuidle",
-        .owner          = THIS_MODULE,
-        .state_count    = ARRAY_SIZE(s3c64xx_cpuidle_set),
-};
-
-static struct cpuidle_device s3c64xx_cpuidle_device = {
-        .state_count    = ARRAY_SIZE(s3c64xx_cpuidle_set),
+        .name   = "s3c64xx_cpuidle",
+        .owner  = THIS_MODULE,
+        .en_core_tk_irqen = 1,
+        .states = {
+                {
+                        .enter            = s3c64xx_enter_idle,
+                        .exit_latency     = 1,
+                        .target_residency = 1,
+                        .flags            = CPUIDLE_FLAG_TIME_VALID,
+                        .name             = "IDLE",
+                        .desc             = "System active, ARM gated",
+                },
+        },
+        .state_count = 1,
 };
 
 static int __init s3c64xx_init_cpuidle(void)
 {
         int ret;
 
-        memcpy(s3c64xx_cpuidle_driver.states, s3c64xx_cpuidle_set,
-               sizeof(s3c64xx_cpuidle_set));
         cpuidle_register_driver(&s3c64xx_cpuidle_driver);
 
         ret = cpuidle_register_device(&s3c64xx_cpuidle_device);