From: Yoichi Yuasa <yuasa@linux-mips.org>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: yuasa@linux-mips.org, linux-mips <linux-mips@linux-mips.org>
Subject: [PATCH 3/5] MIPS: remove powertv mips_machine_halt()
Date: Fri, 18 Dec 2009 21:33:46 +0900 [thread overview]
Message-ID: <20091218213346.01f63eac.yuasa@linux-mips.org> (raw)
In-Reply-To: <20091218213018.79a9fc11.yuasa@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
next prev parent reply other threads:[~2009-12-18 13:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-18 12:29 [PATCH 1/5]MIPS: remove unused powertv prom_getcmdline() Yoichi Yuasa
2009-12-18 12:30 ` [PATCH 2/5] MIPS: remove unused powertv ptv_memsize Yoichi Yuasa
2009-12-18 12:33 ` Yoichi Yuasa [this message]
2009-12-18 12:36 ` [PATCH 4/5] MIPS: remove unused powertv platform_die() Yoichi Yuasa
2009-12-18 12:38 ` [PATCH 5/5] MIPS: simplify powertv prom_init_cmdline() and merge to prom_init() Yoichi Yuasa
2009-12-22 1:37 ` David VomLehn
2009-12-22 8:18 ` Ralf Baechle
2009-12-24 13:52 ` Ralf Baechle
2009-12-22 1:36 ` [PATCH 4/5] MIPS: remove unused powertv platform_die() David VomLehn
2009-12-24 13:52 ` Ralf Baechle
2009-12-22 1:35 ` [PATCH 3/5] MIPS: remove powertv mips_machine_halt() David VomLehn
2009-12-24 13:51 ` Ralf Baechle
2009-12-22 1:34 ` [PATCH 2/5] MIPS: remove unused powertv ptv_memsize David VomLehn
2009-12-24 13:58 ` Ralf Baechle
2009-12-24 2:02 ` David VomLehn
2009-12-24 13:51 ` Ralf Baechle
2009-12-22 1:33 ` [PATCH 1/5]MIPS: remove unused powertv prom_getcmdline() David VomLehn
2009-12-24 13:51 ` Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091218213346.01f63eac.yuasa@linux-mips.org \
--to=yuasa@linux-mips.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.