1
0
Fork 0

ARM: substitute arch_idle()

Now that all implementations of arch_idle() are equivalent to cpu_do_idle()
we can just use the later directly and stop including mach/system.h.

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-and-tested-by: Jamie Iles <jamie@jamieiles.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
hifive-unleashed-5.1
Nicolas Pitre 2011-12-19 03:03:58 -05:00 committed by Nicolas Pitre
parent daa14d5e60
commit ae94091303
3 changed files with 4 additions and 7 deletions

View File

@ -61,8 +61,6 @@ extern void setup_mm_for_reboot(void);
static volatile int hlt_counter; static volatile int hlt_counter;
#include <mach/system.h>
void disable_hlt(void) void disable_hlt(void)
{ {
hlt_counter++; hlt_counter++;
@ -191,7 +189,7 @@ static void default_idle(void)
if (arm_pm_idle) if (arm_pm_idle)
arm_pm_idle(); arm_pm_idle();
else else
arch_idle(); cpu_do_idle();
local_irq_enable(); local_irq_enable();
} }

View File

@ -15,13 +15,12 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/system.h>
static int mxs_suspend_enter(suspend_state_t state) static int mxs_suspend_enter(suspend_state_t state)
{ {
switch (state) { switch (state) {
case PM_SUSPEND_MEM: case PM_SUSPEND_MEM:
arch_idle(); cpu_do_idle();
break; break;
default: default:

View File

@ -173,7 +173,7 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
* omap_default_idle - OMAP4 default ilde routine.' * omap_default_idle - OMAP4 default ilde routine.'
* *
* Implements OMAP4 memory, IO ordering requirements which can't be addressed * Implements OMAP4 memory, IO ordering requirements which can't be addressed
* with default arch_idle() hook. Used by all CPUs with !CONFIG_CPUIDLE and * with default cpu_do_idle() hook. Used by all CPUs with !CONFIG_CPUIDLE and
* by secondary CPU with CONFIG_CPUIDLE. * by secondary CPU with CONFIG_CPUIDLE.
*/ */
static void omap_default_idle(void) static void omap_default_idle(void)
@ -253,7 +253,7 @@ static int __init omap4_pm_init(void)
suspend_set_ops(&omap_pm_ops); suspend_set_ops(&omap_pm_ops);
#endif /* CONFIG_SUSPEND */ #endif /* CONFIG_SUSPEND */
/* Overwrite the default arch_idle() */ /* Overwrite the default cpu_do_idle() */
arm_pm_idle = omap_default_idle; arm_pm_idle = omap_default_idle;
omap4_idle_init(); omap4_idle_init();