Skip to content

Commit

Permalink
ARM: substitute arch_idle()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nicolas Pitre authored and Nicolas Pitre committed Jan 20, 2012
1 parent daa14d5 commit ae94091
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
4 changes: 1 addition & 3 deletions arch/arm/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ extern void setup_mm_for_reboot(void);

static volatile int hlt_counter;

#include <mach/system.h>

void disable_hlt(void)
{
hlt_counter++;
Expand Down Expand Up @@ -191,7 +189,7 @@ static void default_idle(void)
if (arm_pm_idle)
arm_pm_idle();
else
arch_idle();
cpu_do_idle();
local_irq_enable();
}

Expand Down
3 changes: 1 addition & 2 deletions arch/arm/mach-mxs/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@
#include <linux/kernel.h>
#include <linux/suspend.h>
#include <linux/io.h>
#include <mach/system.h>

static int mxs_suspend_enter(suspend_state_t state)
{
switch (state) {
case PM_SUSPEND_MEM:
arch_idle();
cpu_do_idle();
break;

default:
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-omap2/pm44xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
* omap_default_idle - OMAP4 default ilde routine.'
*
* 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.
*/
static void omap_default_idle(void)
Expand Down Expand Up @@ -253,7 +253,7 @@ static int __init omap4_pm_init(void)
suspend_set_ops(&omap_pm_ops);
#endif /* CONFIG_SUSPEND */

/* Overwrite the default arch_idle() */
/* Overwrite the default cpu_do_idle() */
arm_pm_idle = omap_default_idle;

omap4_idle_init();
Expand Down

0 comments on commit ae94091

Please sign in to comment.