diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-11-18 02:13:09 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-18 02:13:09 -0500 |
commit | 4be887342c48f3b1e208bac6375c19c57791a3b9 (patch) | |
tree | cfbdc1a7c7abb69bade6c8a2113e5a01fdc805b3 /arch/sh/kernel/cpu/shmobile | |
parent | 62d3ba8bba6fb1d1362dcaa1da2679f4ab740226 (diff) |
sh: cpuidle: Migrate off of hwblk API.
Now that the hwblk API is unused and going away, migrate cpuidle off of
it. This is a pretty straightforward migration given that we weren't
really making use of the allowed mode overloading in the first place, so
simply default to regular sleep mode.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/shmobile')
-rw-r--r-- | arch/sh/kernel/cpu/shmobile/cpuidle.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c index 1cc257c9b1e3..6d62eb40e750 100644 --- a/arch/sh/kernel/cpu/shmobile/cpuidle.c +++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/export.h> | 17 | #include <linux/export.h> |
18 | #include <asm/suspend.h> | 18 | #include <asm/suspend.h> |
19 | #include <asm/uaccess.h> | 19 | #include <asm/uaccess.h> |
20 | #include <asm/hwblk.h> | ||
21 | 20 | ||
22 | static unsigned long cpuidle_mode[] = { | 21 | static unsigned long cpuidle_mode[] = { |
23 | SUSP_SH_SLEEP, /* regular sleep mode */ | 22 | SUSP_SH_SLEEP, /* regular sleep mode */ |
@@ -29,7 +28,7 @@ static int cpuidle_sleep_enter(struct cpuidle_device *dev, | |||
29 | struct cpuidle_driver *drv, | 28 | struct cpuidle_driver *drv, |
30 | int index) | 29 | int index) |
31 | { | 30 | { |
32 | unsigned long allowed_mode = arch_hwblk_sleep_mode(); | 31 | unsigned long allowed_mode = SUSP_SH_SLEEP; |
33 | ktime_t before, after; | 32 | ktime_t before, after; |
34 | int requested_state = index; | 33 | int requested_state = index; |
35 | int allowed_state; | 34 | int allowed_state; |