From patchwork Wed Jun 22 15:14:57 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: 906062 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5MFTIRf026217 for ; Wed, 22 Jun 2011 15:29:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932369Ab1FVP3Q (ORCPT ); Wed, 22 Jun 2011 11:29:16 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:57677 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932343Ab1FVP3Q (ORCPT ); Wed, 22 Jun 2011 11:29:16 -0400 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=Sw2yLW3+6czplsLB2H6MQ53826r15bkdAZyUWTNaxZ8=; b=Fd2zRQ4w1WnOo/SAgoUVbF+AvOZrvqUGNUnQvYZyw6CfC/kV8ynegOo9BFap0YlQRssTipq3G6eLMN5fBrxZqOI5/gfiRuO8Y9doXST3HhNYKU8qvtUkmxoGzxogp679dlV9hRDjpv7aaG/tr59rMy+CEeHvwL1qp7oDlwaiqXA=; 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 1QZPMC-0003zF-2C; Wed, 22 Jun 2011 16:28:44 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1QZP8r-0002Wz-7p; Wed, 22 Jun 2011 16:14:57 +0100 In-Reply-To: <20110622150816.GT23234@n2100.arm.linux.org.uk> References: <20110622150816.GT23234@n2100.arm.linux.org.uk> From: Russell King - ARM Linux To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 19/25] ARM: pm: sa1100: no need to re-enable clock switching MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Wed, 22 Jun 2011 16:14:57 +0100 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 22 Jun 2011 15:29:18 +0000 (UTC) This is now taken care of by calling cpu_proc_init() in the resume path, so eliminate this unnecessary call. Signed-off-by: Russell King --- arch/arm/mach-sa1100/pm.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c index d49eaf2..259ed3b 100644 --- a/arch/arm/mach-sa1100/pm.c +++ b/arch/arm/mach-sa1100/pm.c @@ -77,9 +77,6 @@ static int sa11x0_pm_enter(suspend_state_t state) /* go zzz */ cpu_suspend(0, PHYS_OFFSET - PAGE_OFFSET, 0, sa1100_finish_suspend); - /* Re-enable clock switching */ - asm volatile("mcr p15, 0, %0, c15, c1, 2" : : "r" (0)); - /* * Ensure not to come back here if it wasn't intended */