iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sh: cpuidle: Migrate off of hwblk API.

Browse Source 
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>
This commit is contained in:
Paul Mundt 2011-11-18 16:13:09 +09:00
parent 62d3ba8bba
commit 4be887342c
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/sh/include/asm/hwblk.h
View File

@ -49,7 +49,6 @@ struct hwblk_info {
!defined(CONFIG_CPU_SUBTYPE_SH7724) !defined(CONFIG_CPU_SUBTYPE_SH7724)
/* Should be defined by processor-specific code */ /* Should be defined by processor-specific code */
int arch_hwblk_init(void); int arch_hwblk_init(void);
int arch_hwblk_sleep_mode(void);
int hwblk_register(struct hwblk_info *info); int hwblk_register(struct hwblk_info *info);
int hwblk_init(void); int hwblk_init(void);

5
arch/sh/kernel/cpu/hwblk.c
View File

@ -106,11 +106,6 @@ int __init __weak arch_hwblk_init(void)
return 0; return 0;
} }
int __weak arch_hwblk_sleep_mode(void)
{
return SUSP_SH_SLEEP;
}
int __init hwblk_init(void) int __init hwblk_init(void)
{ {
return arch_hwblk_init(); return arch_hwblk_init();

3
arch/sh/kernel/cpu/shmobile/cpuidle.c
View File

@ -17,7 +17,6 @@
#include <linux/export.h> #include <linux/export.h>
#include <asm/suspend.h> #include <asm/suspend.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/hwblk.h>
static unsigned long cpuidle_mode[] = { static unsigned long cpuidle_mode[] = {
SUSP_SH_SLEEP, /* regular sleep mode */ SUSP_SH_SLEEP, /* regular sleep mode */
@ -29,7 +28,7 @@ static int cpuidle_sleep_enter(struct cpuidle_device *dev,
struct cpuidle_driver *drv, struct cpuidle_driver *drv,
int index) int index)
{ {
unsigned long allowed_mode = arch_hwblk_sleep_mode(); unsigned long allowed_mode = SUSP_SH_SLEEP;
ktime_t before, after; ktime_t before, after;
int requested_state = index; int requested_state = index;
int allowed_state; int allowed_state;