MIPS: PowerTV: Remove mips_machine_halt() (2620c357) · Commits · 戴 / test

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>

arch/mips/powertv/reset.c

+0 −18

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message