From patchwork Mon Jun 13 17:19:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 875922 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5DHJoxr019616 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 13 Jun 2011 17:20:10 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QWAnd-0001Vr-UN; Mon, 13 Jun 2011 17:19:42 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QWAnd-00030H-88; Mon, 13 Jun 2011 17:19:41 +0000 Received: from [2002:4e20:1eda::1] (helo=caramon.arm.linux.org.uk) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QWAna-0002zz-LO for linux-arm-kernel@lists.infradead.org; Mon, 13 Jun 2011 17:19:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Date:Sender:Message-Id:Content-Type:MIME-Version:Subject:To:From:References:In-Reply-To; bh=4ju4rcwDP4HSDFrdBemsGxAIUKZgPrREvjJ6vJTkeaA=; b=LFZgMXMFCUx/D5zNiY4ttCLRJmwwIYAnzeXfp+rzaaeyeSliQdzkpPnWT83J9l7SPY49Nc3TSeD0XLyT8WSXphHeVtOhqPLUwdXQaWXtaTqV3UYxCoUi+YOoIEmAskqnd6+C2yNxeuIHtQd72xRo6e0JyWvZxBPiFrjdLLbwPOE=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd] helo=rmk-PC.arm.linux.org.uk) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1QWAnX-0001dx-8z for linux-arm-kernel@lists.infradead.org; Mon, 13 Jun 2011 18:19:35 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1QWAnW-0002ek-Dt for linux-arm-kernel@lists.infradead.org; Mon, 13 Jun 2011 18:19:34 +0100 In-Reply-To: <20110613171446.GF13643@n2100.arm.linux.org.uk> References: <20110613171446.GF13643@n2100.arm.linux.org.uk> From: Russell King - ARM Linux To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 14/14] ARM: suspend: pxa: cleanup PXA suspend code MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 13 Jun 2011 18:19:34 +0100 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110613_131939_269398_6D66B54B X-CRM114-Status: GOOD ( 10.69 ) X-Spam-Score: 1.2 (+) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 13 Jun 2011 17:20:11 +0000 (UTC) Remove now redundant stacking of registers. Signed-off-by: Russell King --- arch/arm/mach-pxa/sleep.S | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S index 3a67887..cd39293 100644 --- a/arch/arm/mach-pxa/sleep.S +++ b/arch/arm/mach-pxa/sleep.S @@ -33,11 +33,15 @@ ENTRY(pxa3xx_cpu_suspend) #ifndef CONFIG_IWMMXT mra r2, r3, acc0 #endif - stmfd sp!, {r2 - r12, lr} @ save registers on stack + stmfd sp!, {r2, r3, lr} @ save registers on stack mov r1, r0 adr r3, BSYM(pxa3xx_finish_suspend) bl cpu_suspend - b pxa_cpu_resume + ldmfd sp!, {r2, r3, lr} +#ifndef CONFIG_IWMMXT + mar acc0, r2, r3 +#endif + mov pc, lr pxa3xx_finish_suspend: mov r0, #0x06 @ S2D3C4 mode @@ -60,11 +64,15 @@ ENTRY(pxa27x_cpu_suspend) #ifndef CONFIG_IWMMXT mra r2, r3, acc0 #endif - stmfd sp!, {r2 - r12, lr} @ save registers on stack + stmfd sp!, {r2, r3, lr} @ save registers on stack mov r2, r0 @ save sleep mode adr r3, BSYM(pxa27x_finish_suspend) bl cpu_suspend - b pxa_cpu_resume + ldmfd sp!, {r2, r3, lr} +#ifndef CONFIG_IWMMXT + mar acc0, r2, r3 +#endif + mov pc, lr pxa27x_finish_suspend: @ Put the processor to sleep @@ -112,11 +120,9 @@ pxa27x_finish_suspend: */ ENTRY(pxa25x_cpu_suspend) - stmfd sp!, {r2 - r12, lr} @ save registers on stack mov r2, r0 @ save sleep mode adr r3, BSYM(pxa25x_finish_suspend) - bl cpu_suspend - b pxa_cpu_resume + b cpu_suspend pxa25x_finish_suspend: @ prepare value for sleep mode @@ -202,16 +208,3 @@ pxa_cpu_do_suspend: mcr p14, 0, r1, c7, c0, 0 @ PWRMODE 20: b 20b @ loop waiting for sleep - -/* - * pxa_cpu_resume() - * - * entry point from bootloader into kernel during resume - */ - .align 5 -pxa_cpu_resume: - ldmfd sp!, {r2, r3} -#ifndef CONFIG_IWMMXT - mar acc0, r2, r3 -#endif - ldmfd sp!, {r4 - r12, pc} @ return to caller