From patchwork Mon Feb 27 04:47:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob X-Patchwork-Id: 6941 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 0E07523E01 for ; Mon, 27 Feb 2012 04:48:01 +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 CABE0A185F1 for ; Mon, 27 Feb 2012 04:48:00 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id z7so7824105iab.11 for ; Sun, 26 Feb 2012 20:48:00 -0800 (PST) Received: from mr.google.com ([10.50.89.232]) by 10.50.89.232 with SMTP id br8mr9251593igb.30.1330318080667 (num_hops = 1); Sun, 26 Feb 2012 20:48:00 -0800 (PST) Received: by 10.50.89.232 with SMTP id br8mr7544093igb.30.1330318080591; Sun, 26 Feb 2012 20:48:00 -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 r10csp57806ibr; Sun, 26 Feb 2012 20:48:00 -0800 (PST) Received: by 10.236.189.72 with SMTP id b48mr3264345yhn.122.1330318079958; Sun, 26 Feb 2012 20:47:59 -0800 (PST) Received: from mail-gx0-f178.google.com (mail-gx0-f178.google.com [209.85.161.178]) by mx.google.com with ESMTPS id l14si6153377ank.12.2012.02.26.20.47.59 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 26 Feb 2012 20:47:59 -0800 (PST) Received-SPF: neutral (google.com: 209.85.161.178 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) client-ip=209.85.161.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.161.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-gx0-f178.google.com with SMTP id i4so2137730ggm.37 for ; Sun, 26 Feb 2012 20:47:59 -0800 (PST) Received-SPF: pass (google.com: domain of rob.lee@linaro.org designates 10.236.116.73 as permitted sender) client-ip=10.236.116.73; Received: from mr.google.com ([10.236.116.73]) by 10.236.116.73 with SMTP id f49mr18482517yhh.97.1330318079797 (num_hops = 1); Sun, 26 Feb 2012 20:47:59 -0800 (PST) MIME-Version: 1.0 Received: by 10.236.116.73 with SMTP id f49mr13793015yhh.97.1330318077192; Sun, 26 Feb 2012 20:47:57 -0800 (PST) Received: from b18647-20 ([67.23.168.6]) by mx.google.com with ESMTPS id w44sm35245363yhk.17.2012.02.26.20.47.54 (version=SSLv3 cipher=OTHER); Sun, 26 Feb 2012 20:47:56 -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 Subject: [PATCH v5 2/9] SH: shmobile: cpuidle consolidation Date: Sun, 26 Feb 2012 22:47:36 -0600 Message-Id: <1330318063-25460-3-git-send-email-rob.lee@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1330318063-25460-1-git-send-email-rob.lee@linaro.org> References: <1330318063-25460-1-git-send-email-rob.lee@linaro.org> X-Gm-Message-State: ALoCoQmigsZ4YEs3hE3KI5a++aXn7r7BSE5jhKUgTv0TxrklY9vi+H2FQ2CEhQ0yWQExqpc0Dcum 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)