| To: | Ralf Baechle <ralf@linux-mips.org> |
|---|---|
| Subject: | [PATCH 3/5] MIPS: remove powertv mips_machine_halt() |
| From: | Yoichi Yuasa <yuasa@linux-mips.org> |
| Date: | Fri, 18 Dec 2009 21:33:46 +0900 |
| Cc: | yuasa@linux-mips.org, linux-mips <linux-mips@linux-mips.org> |
| Dkim-signature: | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:date:from:to:cc :subject:message-id:in-reply-to:references:x-mailer:mime-version :content-type:content-transfer-encoding; bh=ELZP8rpIkL/49NAEKn2TBCb8ahCssVPdtlqXVz4jzog=; b=fgLl9bJXIJt2o6SqRDoMgNq0dsTmlhw/fMZlz5jNQwCIxTr1OrF8DtIGds0Z/Emzyd GS+keyUMIcKkukfxh/kgklGlPeTLVy+Lq8rfFMHKcitgWeSUQKq9+o04Gat3gv/4JKDo JlaKfBSBl99dxHnGmx3L/X9NynoMuT8gvERd0= |
| Domainkey-signature: | a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:in-reply-to:references :x-mailer:mime-version:content-type:content-transfer-encoding; b=Ydb/4yF+oMGdebkY2L+I5WxkGTmZjGNWQAbieNwAgTV9fm8iJ6xrmZtFYb2ttUOx+W 4VcKjJuvxX598sea0HGHAOQ63jXxRQZMb5orPqaDRSN2OJmDQDZMrhyk3UAKiXImSgWH ijGsfbFYbmX9vgIYgNuuUEMve0y6xQjTTxA5I= |
| In-reply-to: | <20091218213018.79a9fc11.yuasa@linux-mips.org> |
| Original-recipient: | rfc822;linux-mips@linux-mips.org |
| References: | <20091218212917.f42e8180.yuasa@linux-mips.org> <20091218213018.79a9fc11.yuasa@linux-mips.org> |
| Sender: | linux-mips-bounce@linux-mips.org |
mips_machine_halt() is same as mips_machine_restart().
In addition, the registration of _machine_halt and pm_power_off are deleted.
because mips_machine_halt() is restart function.
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
arch/mips/powertv/reset.c | 18 ------------------
1 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/arch/mips/powertv/reset.c b/arch/mips/powertv/reset.c
index 494c652..0007652 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;
}
--
1.6.5.7
|
| Previous by Date: | [PATCH 1/5]MIPS: remove unused powertv prom_getcmdline(), Yoichi Yuasa |
|---|---|
| Next by Date: | [PATCH 2/5] MIPS: remove unused powertv ptv_memsize, Yoichi Yuasa |
| Previous by Thread: | [PATCH 2/5] MIPS: remove unused powertv ptv_memsize, Yoichi Yuasa |
| Next by Thread: | [PATCH 4/5] MIPS: remove unused powertv platform_die(), Yoichi Yuasa |
| Indexes: | [Date] [Thread] [Top] [All Lists] |