summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2016-09-20 00:21:29 +0300
committerRalf Baechle <ralf@linux-mips.org>2016-10-06 18:31:01 +0300
commitc834469b88cd0a54b313012e9f023937c68a5704 (patch)
tree2eb168ef9b918c6f3331e46bf370d9e3e1e9b4e2
parent10b6ea0959de2c42b9f105c88b51a54c4dd961c2 (diff)
downloadlinux-c834469b88cd0a54b313012e9f023937c68a5704.tar.xz
MIPS: Malta: Remove custom halt implementation
The arch code will hang the machine with an infinite loop if the board doesn't provide an impelementation of halt - let it, rather than duplicating it. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/14280/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/mti-malta/malta-reset.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/mips/mti-malta/malta-reset.c b/arch/mips/mti-malta/malta-reset.c
index 04d6b9c8a946..dd6f62ad4417 100644
--- a/arch/mips/mti-malta/malta-reset.c
+++ b/arch/mips/mti-malta/malta-reset.c
@@ -13,11 +13,6 @@
#include <asm/reboot.h>
#include <asm/mach-malta/malta-pm.h>
-static void mips_machine_halt(void)
-{
- while (true);
-}
-
static void mips_machine_power_off(void)
{
mips_pm_suspend(PIIX4_FUNC3IO_PMCNTRL_SUS_TYP_SOFF);
@@ -28,7 +23,6 @@ static void mips_machine_power_off(void)
static int __init mips_reboot_setup(void)
{
- _machine_halt = mips_machine_halt;
pm_power_off = mips_machine_power_off;
return 0;