Skip to content

Commit

Permalink
ARM: restart: remove poodle restart handler
Browse files Browse the repository at this point in the history
The poodle restart handler was added in 74617fb (3593/1: Add reboot
and shutdown handlers for Zaurus handhelds), and at that time it was
necessary to deal with the RCSR register.  This commit also forced all
restarts to use the 'hard' restart method.

In dc38e2a (pxa: Fix RCSR handling), the RCSR handling was removed,
leaving just the forcing to use a 'hard' restart.  As hard restarts are
the default (in the absense of a reboot= command line argument), this
seems pointless.  In any case, Richard Purdie says:

> From what I remember that hardware either always reboots or always
> halts. I think the option was therefore left hardcoded to make it clear
> it wasn't expected to work. Later Zaurii models could do either but
> required some manual poking of registers to make it happen iirc.
>
> Regardless, you can probably clean this up as you suggest now.

So, lets remove the unnecessary interception and rely on the default
restart mode.

Acked-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Nov 21, 2011
1 parent e5bc9e2 commit 3f1517a
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions arch/arm/mach-pxa/poodle.c
Original file line number Diff line number Diff line change
Expand Up @@ -420,17 +420,11 @@ static void poodle_poweroff(void)
arm_machine_restart('h', NULL);
}

static void poodle_restart(char mode, const char *cmd)
{
arm_machine_restart('h', cmd);
}

static void __init poodle_init(void)
{
int ret = 0;

pm_power_off = poodle_poweroff;
arm_pm_restart = poodle_restart;

PCFR |= PCFR_OPDE;

Expand Down

0 comments on commit 3f1517a

Please sign in to comment.