aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/powertv
diff options
context:
space:
mode:
authorYoichi Yuasa <yuasa@linux-mips.org>2009-12-18 21:33:46 +0900
committerRalf Baechle <ralf@linux-mips.org>2010-01-12 18:19:32 +0100
commit2620c3570f748647afb17e095507099a309ed8f6 (patch)
tree985c1dccc3c125d9e536e2105d6cc3b6c68c0824 /arch/mips/powertv
parent09b7c9f24d8e9b772da682b52b83c88f426a849d (diff)
downloadlinux-2.6.34-ux500-2620c3570f748647afb17e095507099a309ed8f6.tar.gz
MIPS: PowerTV: Remove mips_machine_halt()
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>
Diffstat (limited to 'arch/mips/powertv')
-rw-r--r--arch/mips/powertv/reset.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/mips/powertv/reset.c b/arch/mips/powertv/reset.c
index 494c652c984..0007652cb77 100644
--- a/arch/mips/powertv/reset.c
+++ b/arch/mips/powertv/reset.c
@@ -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
@@ -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;
}