Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  cpuidle: Single/Global registration of idle states
  cpuidle: Split cpuidle_state structure and move per-cpu statistics fields
  cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev->prepare()
  cpuidle: Move dev->last_residency update to driver enter routine; remove dev->last_state
  ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning
  ACPI: Export FADT pm_profile integer value to userspace
  thermal: Prevent polling from happening during system suspend
  ACPI: Drop ACPI_NO_HARDWARE_INIT
  ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()
  PNPACPI: Simplify disabled resource registration
  ACPI: Fix possible recursive locking in hwregs.c
  ACPI: use kstrdup()
  mrst pmu: update comment
  tools/power turbostat: less verbose debugging

1 files changed, 17 insertions, 11 deletions

diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c
index 7d98f909a8ac..1cc257c9b1e3 100644
--- a/arch/sh/kernel/cpu/shmobile/cpuidle.c
+++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c
@@ -26,11 +26,12 @@ static unsigned long cpuidle_mode[] = {
 };
 
 static int cpuidle_sleep_enter(struct cpuidle_device *dev,
-                               struct cpuidle_state *state)
+                                struct cpuidle_driver *drv,
+                                int index)
 {
         unsigned long allowed_mode = arch_hwblk_sleep_mode();
         ktime_t before, after;
-        int requested_state = state - &dev->states[0];
+        int requested_state = index;
         int allowed_state;
         int k;
 
@@ -47,11 +48,13 @@ static int cpuidle_sleep_enter(struct cpuidle_device *dev,
          */
         k = min_t(int, allowed_state, requested_state);
 
-        dev->last_state = &dev->states[k];
         before = ktime_get();
         sh_mobile_call_standby(cpuidle_mode[k]);
         after = ktime_get();
-        return ktime_to_ns(ktime_sub(after, before)) >> 10;
+
+        dev->last_residency = (int)ktime_to_ns(ktime_sub(after, before)) >> 10;
+
+        return k;
 }
 
 static struct cpuidle_device cpuidle_dev;
@@ -63,19 +66,19 @@ static struct cpuidle_driver cpuidle_driver = {
 void sh_mobile_setup_cpuidle(void)
 {
         struct cpuidle_device *dev = &cpuidle_dev;
+        struct cpuidle_driver *drv = &cpuidle_driver;
         struct cpuidle_state *state;
         int i;
 
-        cpuidle_register_driver(&cpuidle_driver);
 
         for (i = 0; i < CPUIDLE_STATE_MAX; i++) {
-                dev->states[i].name[0] = '\0';
-                dev->states[i].desc[0] = '\0';
+                drv->states[i].name[0] = '\0';
+                drv->states[i].desc[0] = '\0';
         }
 
         i = CPUIDLE_DRIVER_STATE_START;
 
-        state = &dev->states[i++];
+        state = &drv->states[i++];
         snprintf(state->name, CPUIDLE_NAME_LEN, "C1");
         strncpy(state->desc, "SuperH Sleep Mode", CPUIDLE_DESC_LEN);
         state->exit_latency = 1;
@@ -85,10 +88,10 @@ void sh_mobile_setup_cpuidle(void)
         state->flags |= CPUIDLE_FLAG_TIME_VALID;
         state->enter = cpuidle_sleep_enter;
 
-        dev->safe_state = state;
+        drv->safe_state_index = i-1;
 
         if (sh_mobile_sleep_supported & SUSP_SH_SF) {
-                state = &dev->states[i++];
+                state = &drv->states[i++];
                 snprintf(state->name, CPUIDLE_NAME_LEN, "C2");
                 strncpy(state->desc, "SuperH Sleep Mode [SF]",
                         CPUIDLE_DESC_LEN);
@@ -101,7 +104,7 @@ void sh_mobile_setup_cpuidle(void)
         }
 
         if (sh_mobile_sleep_supported & SUSP_SH_STANDBY) {
-                state = &dev->states[i++];
+                state = &drv->states[i++];
                 snprintf(state->name, CPUIDLE_NAME_LEN, "C3");
                 strncpy(state->desc, "SuperH Mobile Standby Mode [SF]",
                         CPUIDLE_DESC_LEN);
@@ -113,7 +116,10 @@ void sh_mobile_setup_cpuidle(void)
                 state->enter = cpuidle_sleep_enter;
         }
 
+        drv->state_count = i;
         dev->state_count = i;
 
+        cpuidle_register_driver(&cpuidle_driver);
+
         cpuidle_register_device(dev);
 }