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>

diff --git a/arch/sh/include/asm/hwblk.h b/arch/sh/include/asm/hwblk.h
index e29461bbe84d3b67950c7144fbd5de44c4c8f7d0..75d50d9bf0a2d465d89964dc48bb00a03e5cac38 100644 (file)
--- a/arch/sh/include/asm/hwblk.h
+++ b/arch/sh/include/asm/hwblk.h
@@ -49,7 +49,6 @@ struct hwblk_info {
     !defined(CONFIG_CPU_SUBTYPE_SH7724)
 /* Should be defined by processor-specific code */
 int arch_hwblk_init(void);
-int arch_hwblk_sleep_mode(void);
 
 int hwblk_register(struct hwblk_info *info);
 int hwblk_init(void);

diff --git a/arch/sh/kernel/cpu/hwblk.c b/arch/sh/kernel/cpu/hwblk.c
index 3e985aae5d912037bdd77f5af91244412e420a0c..00bab455a017639da7a5e08e2ebeb308b45d2973 100644 (file)
--- a/arch/sh/kernel/cpu/hwblk.c
+++ b/arch/sh/kernel/cpu/hwblk.c
@@ -106,11 +106,6 @@ int __init __weak arch_hwblk_init(void)
        return 0;
 }
 
-int __weak arch_hwblk_sleep_mode(void)
-{
-       return SUSP_SH_SLEEP;
-}
-
 int __init hwblk_init(void)
 {
        return arch_hwblk_init();

diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c
index 1cc257c9b1e311b806ed2defaa36b6db9ea5c920..6d62eb40e750a2d8ad00919c0d75de477155875f 100644 (file)
--- a/arch/sh/kernel/cpu/shmobile/cpuidle.c
+++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c
@@ -17,7 +17,6 @@
 #include <linux/export.h>
 #include <asm/suspend.h>
 #include <asm/uaccess.h>
-#include <asm/hwblk.h>
 
 static unsigned long cpuidle_mode[] = {
        SUSP_SH_SLEEP, /* regular sleep mode */
@@ -29,7 +28,7 @@ static int cpuidle_sleep_enter(struct cpuidle_device *dev,
                                struct cpuidle_driver *drv,
                                int index)
 {
-       unsigned long allowed_mode = arch_hwblk_sleep_mode();
+       unsigned long allowed_mode = SUSP_SH_SLEEP;
        ktime_t before, after;
        int requested_state = index;
        int allowed_state;