Received: from mail.onstor.com ([66.201.51.107]) by onstor-exch02.onstor.net with Microsoft SMTPSVC(6.0.3790.1830);
	 Fri, 11 Jul 2008 06:40:39 -0700
Received: from chiesmta2-2.messageone.com ([216.203.30.55]) by mail.onstor.com with Microsoft SMTPSVC(6.0.3790.1830);
	 Fri, 11 Jul 2008 06:40:38 -0700
Received: from ftp.linux-mips.org (ftp.linux-mips.org [213.58.128.207])
	by chiesmta2-2.messageone.com (8.13.8/8.13.8) with ESMTP id m6BDebao019775
	for <andy.sharp@onstor.com>; Fri, 11 Jul 2008 08:40:38 -0500
Received: from localhost.localdomain ([127.0.0.1]:49832 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP
	id S20031044AbYGKNkU (ORCPT <rfc822;andy.sharp@onstor.com>);
	Fri, 11 Jul 2008 14:40:20 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 11 Jul 2008 14:40:03 +0100 (BST)
Received: from mo32.po.2iij.NET ([210.128.50.17]:56101 "EHLO mo32.po.2iij.net")
	by ftp.linux-mips.org with ESMTP id S20031722AbYGKNjn (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Fri, 11 Jul 2008 14:39:43 +0100
Received: by mo.po.2iij.net (mo32) id m6BDde5X090118; Fri, 11 Jul 2008 22:39:40 +0900 (JST)
Received: from delta (61.25.30.125.dy.iij4u.or.jp [125.30.25.61])
	by mbox.po.2iij.net (po-mbox304) id m6BDdd2o011986
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Fri, 11 Jul 2008 22:39:39 +0900
Date: 	Fri, 11 Jul 2008 22:39:18 +0900
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips <linux-mips@linux-mips.org>
Subject: [PATCH 2/2][MIPS] remove wrppmc_machine_power_off()
Message-Id: <20080711223918.695c5487.yoichi_yuasa@tripeaks.co.jp>
In-Reply-To: <20080711223748.e164b514.yoichi_yuasa@tripeaks.co.jp>
References: <20080711223748.e164b514.yoichi_yuasa@tripeaks.co.jp>
Organization: TriPeaks Corporation
X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.9; i486-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-archive-position: 19776
X-ecartis-version: Ecartis v1.0.0
Sender: linux-mips-bounce@linux-mips.org
Errors-to: linux-mips-bounce@linux-mips.org
X-original-sender: yoichi_yuasa@tripeaks.co.jp
Precedence: bulk
X-list: 	linux-mips
X-MessageOne-Virus-Version: vendor=fsecure engine=4.65.7161:2.4.4,1.2.40,4.0.164 definitions=2008-07-11_03:2008-07-09,2008-07-11,2008-07-10 signatures=0
X-MessageOne-Virus-Scanned: Clean
X-MessageOne-Envelope-Sender: linux-mips-bounce@linux-mips.org
X-MessageOne-Spam-Details: rule=m773emszm_notspam policy=m773emszm score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=3.1.0-0805090000 definitions=main-0807110058
X-MessageOne-Spam-Score: 0
X-MessageOne-Spam-Bar: 
Return-Path: linux-mips-bounce@linux-mips.org
X-OriginalArrivalTime: 11 Jul 2008 13:40:39.0046 (UTC) FILETIME=[B488EA60:01C8E35B]

Remove wrppmc_machine_power_off().
It can be replace wrppmc_machine_halt().

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

diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/gt64120/wrppmc/reset.c linux/arch/mips/gt64120/wrppmc/reset.c
--- linux-orig/arch/mips/gt64120/wrppmc/reset.c	2008-07-08 13:33:35.731399494 +0900
+++ linux/arch/mips/gt64120/wrppmc/reset.c	2008-07-08 13:33:45.979983528 +0900
@@ -38,8 +38,3 @@ void wrppmc_machine_halt(void)
 			cpu_wait();
 	}
 }
-
-void wrppmc_machine_power_off(void)
-{
-	wrppmc_machine_halt();
-}
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/gt64120/wrppmc/setup.c linux/arch/mips/gt64120/wrppmc/setup.c
--- linux-orig/arch/mips/gt64120/wrppmc/setup.c	2008-07-08 10:12:29.899943226 +0900
+++ linux/arch/mips/gt64120/wrppmc/setup.c	2008-07-08 13:34:20.305939652 +0900
@@ -98,11 +98,10 @@ void __init plat_mem_setup(void)
 {
 	extern void wrppmc_machine_restart(char *command);
 	extern void wrppmc_machine_halt(void);
-	extern void wrppmc_machine_power_off(void);
 
 	_machine_restart = wrppmc_machine_restart;
 	_machine_halt	 = wrppmc_machine_halt;
-	pm_power_off	 = wrppmc_machine_power_off;
+	pm_power_off	 = wrppmc_machine_halt;
 
 	/* This makes the operations of 'in/out[bwl]' to the
 	 * physical address ( < KSEG0) can work via KSEG1

