Skip to content

Commit

Permalink
MIPS: PowerTV: Remove mips_machine_halt()
Browse files Browse the repository at this point in the history
mips_machine_halt() is same as mips_machine_restart().  Also delete the
registration of _machine_halt and pm_power_off because mips_machine_halt()
is the restart function.

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/798/
Reviewed-by: David VomLehn <dvomlehn@cisco.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Yoichi Yuasa authored and Ralf Baechle committed Jan 12, 2010
1 parent 09b7c9f commit 2620c35
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions arch/mips/powertv/reset.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
#include <asm/mach-powertv/asic_regs.h>
#include "reset.h"

static void mips_machine_restart(char *command);
static void mips_machine_halt(void);

static void mips_machine_restart(char *command)
{
#ifdef CONFIG_BOOTLOADER_DRIVER
Expand All @@ -44,22 +41,7 @@ static void mips_machine_restart(char *command)
#endif
}

static void mips_machine_halt(void)
{
#ifdef CONFIG_BOOTLOADER_DRIVER
/*
* Call the bootloader's reset function to ensure
* that persistent data is flushed before hard reset
*/
kbldr_SetCauseAndReset();
#else
writel(0x1, asic_reg_addr(watchdog));
#endif
}

void mips_reboot_setup(void)
{
_machine_restart = mips_machine_restart;
_machine_halt = mips_machine_halt;
pm_power_off = mips_machine_halt;
}

0 comments on commit 2620c35

Please sign in to comment.