From c834469b88cd0a54b313012e9f023937c68a5704 Mon Sep 17 00:00:00 2001 From: Paul Burton Date: Mon, 19 Sep 2016 22:21:29 +0100 Subject: [PATCH] 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 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 --- arch/mips/mti-malta/malta-reset.c | 6 ------ 1 file changed, 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 #include -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; -- 2.39.2