From patchwork Wed Feb 29 03:11:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob X-Patchwork-Id: 6992 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id A2EDA23EA8 for ; Wed, 29 Feb 2012 03:12:26 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 6B7A9A18090 for ; Wed, 29 Feb 2012 03:12:26 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so2503688iag.11 for ; Tue, 28 Feb 2012 19:12:26 -0800 (PST) Received: from mr.google.com ([10.50.207.72]) by 10.50.207.72 with SMTP id lu8mr25304539igc.0.1330485146280 (num_hops = 1); Tue, 28 Feb 2012 19:12:26 -0800 (PST) Received: by 10.50.207.72 with SMTP id lu8mr20513862igc.0.1330485146247; Tue, 28 Feb 2012 19:12:26 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.11.10 with SMTP id r10csp23428ibr; Tue, 28 Feb 2012 19:12:25 -0800 (PST) Received: by 10.236.92.201 with SMTP id j49mr25103418yhf.60.1330485145547; Tue, 28 Feb 2012 19:12:25 -0800 (PST) Received: from mail-yx0-f178.google.com (mail-yx0-f178.google.com [209.85.213.178]) by mx.google.com with ESMTPS id k50si22463173yhj.149.2012.02.28.19.12.25 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Feb 2012 19:12:25 -0800 (PST) Received-SPF: neutral (google.com: 209.85.213.178 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) client-ip=209.85.213.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.213.178 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) smtp.mail=rob.lee@linaro.org Received: by mail-yx0-f178.google.com with SMTP id m12so3384193yen.37 for ; Tue, 28 Feb 2012 19:12:25 -0800 (PST) Received-SPF: pass (google.com: domain of rob.lee@linaro.org designates 10.236.175.36 as permitted sender) client-ip=10.236.175.36; Received: from mr.google.com ([10.236.175.36]) by 10.236.175.36 with SMTP id y24mr31576117yhl.64.1330485145399 (num_hops = 1); Tue, 28 Feb 2012 19:12:25 -0800 (PST) MIME-Version: 1.0 Received: by 10.236.175.36 with SMTP id y24mr23949356yhl.64.1330485142780; Tue, 28 Feb 2012 19:12:22 -0800 (PST) Received: from b18647-20 ([216.59.3.73]) by mx.google.com with ESMTPS id j2sm32232637ani.19.2012.02.28.19.12.19 (version=SSLv3 cipher=OTHER); Tue, 28 Feb 2012 19:12:22 -0800 (PST) From: Robert Lee To: len.brown@intel.com, khilman@ti.com Cc: robherring2@gmail.com, Baohua.Song@csr.com, amit.kucheria@linaro.org, nicolas.ferre@atmel.com, linux@maxim.org.za, kgene.kim@samsung.com, amit.kachhap@linaro.org, magnus.damm@gmail.com, nsekhar@ti.com, daniel.lezcano@linaro.org, mturquette@linaro.org, vincent.guittot@linaro.org, arnd.bergmann@linaro.org, linux-arm-kernel@lists.infradead.org, linaro-dev@lists.linaro.org, patches@linaro.org, deepthi@linux.vnet.ibm.com, broonie@opensource.wolfsonmicro.com, nicolas.pitre@linaro.org, linux@arm.linux.org.uk, jean.pihet@newoldbits.com, venki@google.com, ccross@google.com, g.trinabh@gmail.com, kernel@wantstofly.org, lethal@linux-sh.org, jon-hunter@ti.com, tony@atomide.com, linux-omap@vger.kernel.org, linux-sh@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH v6 9/9] SH: shmobile: Consolidate time keeping and irq enable Date: Tue, 28 Feb 2012 21:11:49 -0600 Message-Id: <1330485109-7327-10-git-send-email-rob.lee@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1330485109-7327-1-git-send-email-rob.lee@linaro.org> References: <1330485109-7327-1-git-send-email-rob.lee@linaro.org> X-Gm-Message-State: ALoCoQkrGb4z7bFzotEXRYNVb4JU0yUGx1wIy0y6C7z8kHK4zN7pzN6arWieZrh1W1fYiI09PEKx Enable core cpuidle timekeeping and irq enabling and remove that handling from this code. Signed-off-by: Robert Lee --- arch/sh/kernel/cpu/shmobile/cpuidle.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c index 6d62eb4..1ddc876 100644 --- a/arch/sh/kernel/cpu/shmobile/cpuidle.c +++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c @@ -29,7 +29,6 @@ static int cpuidle_sleep_enter(struct cpuidle_device *dev, int index) { unsigned long allowed_mode = SUSP_SH_SLEEP; - ktime_t before, after; int requested_state = index; int allowed_state; int k; @@ -47,19 +46,16 @@ static int cpuidle_sleep_enter(struct cpuidle_device *dev, */ k = min_t(int, allowed_state, requested_state); - before = ktime_get(); sh_mobile_call_standby(cpuidle_mode[k]); - after = ktime_get(); - - dev->last_residency = (int)ktime_to_ns(ktime_sub(after, before)) >> 10; return k; } static struct cpuidle_device cpuidle_dev; static struct cpuidle_driver cpuidle_driver = { - .name = "sh_idle", - .owner = THIS_MODULE, + .name = "sh_idle", + .owner = THIS_MODULE, + .en_core_tk_irqen = 1, }; void sh_mobile_setup_cpuidle(void)