linux-mips
[Top] [All Lists]

[PATCH][4/4] remove cobalt_machine_power_off()

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH][4/4] remove cobalt_machine_power_off()
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Tue, 2 Oct 2007 23:21:36 +0900
Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips <linux-mips@linux-mips.org>
In-reply-to: <20071002231738.78779515.yoichi_yuasa@tripeaks.co.jp>
Organization: TriPeaks Corporation
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20071002225441.63d935eb.yoichi_yuasa@tripeaks.co.jp> <20071002231317.0fbaf7bb.yoichi_yuasa@tripeaks.co.jp> <20071002231738.78779515.yoichi_yuasa@tripeaks.co.jp>
Sender: linux-mips-bounce@linux-mips.org
Remove cobalt_machine_power_off().
It's same as cobalt_machine_halt().

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/reset.c 
mips/arch/mips/cobalt/reset.c
--- mips-orig/arch/mips/cobalt/reset.c  2007-10-01 17:52:43.870115250 +0900
+++ mips/arch/mips/cobalt/reset.c       2007-10-01 17:52:51.622599750 +0900
@@ -61,12 +61,3 @@ void cobalt_machine_restart(char *comman
        /* we should never get here */
        cobalt_machine_halt();
 }
-
-/*
- * This triggers the luser mode device driver for the power switch ;-)
- */
-void cobalt_machine_power_off(void)
-{
-       printk("You can switch the machine off now.\n");
-       cobalt_machine_halt();
-}
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c 
mips/arch/mips/cobalt/setup.c
--- mips-orig/arch/mips/cobalt/setup.c  2007-10-01 17:03:49.370720500 +0900
+++ mips/arch/mips/cobalt/setup.c       2007-10-01 17:52:51.634600500 +0900
@@ -25,7 +25,6 @@
 
 extern void cobalt_machine_restart(char *command);
 extern void cobalt_machine_halt(void);
-extern void cobalt_machine_power_off(void);
 
 const char *get_system_type(void)
 {
@@ -96,7 +95,7 @@ void __init plat_mem_setup(void)
 
        _machine_restart = cobalt_machine_restart;
        _machine_halt = cobalt_machine_halt;
-       pm_power_off = cobalt_machine_power_off;
+       pm_power_off = cobalt_machine_halt;
 
        set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE));
 

<Prev in Thread] Current Thread [Next in Thread>