Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4be88734 authored by Paul Mundt's avatar Paul Mundt
Browse files

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent 62d3ba8b

arch/sh/include/asm/hwblk.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/sh/kernel/cpu/hwblk.c

+0 −5
Original line number Diff line number Diff line
@@ -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();

arch/sh/kernel/cpu/shmobile/cpuidle.c

+1 −2
Original line number Diff line number Diff line
@@ -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;