From: Robert Lee <rob.lee@linaro.org>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 9/9] SH: shmobile: Consolidate time keeping and irq enable
Date: Thu, 01 Mar 2012 00:42:58 +0000 [thread overview]
Message-ID: <1330562578-3410-10-git-send-email-rob.lee@linaro.org> (raw)
In-Reply-To: <1330562578-3410-1-git-send-email-rob.lee@linaro.org>
Enable core cpuidle timekeeping and irq enabling and remove that
handling from this code.
Signed-off-by: Robert Lee <rob.lee@linaro.org>
---
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)
--
1.7.1
next prev parent reply other threads:[~2012-03-01 0:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-01 0:42 [PATCH v7 0/9] Consolidate cpuidle functionality Robert Lee
2012-03-01 0:42 ` [PATCH v7 1/9] cpuidle: Add common time keeping and irq enabling Robert Lee
2012-03-01 4:27 ` Deepthi Dharwar
2012-03-01 20:42 ` Rob Lee
2012-03-01 0:42 ` [PATCH v7 2/9] ARM: at91: Consolidate time keeping and irq enable Robert Lee
2012-03-01 0:42 ` [PATCH v7 3/9] ARM: exynos: " Robert Lee
2012-03-01 0:42 ` [PATCH v7 4/9] ARM: kirkwood: " Robert Lee
2012-03-01 0:42 ` [PATCH v7 5/9] ARM: davinci: " Robert Lee
2012-03-01 0:42 ` [PATCH v7 6/9] ARM: omap: Consolidate OMAP3 " Robert Lee
2012-03-01 0:42 ` [PATCH v7 7/9] ARM: omap: Consolidate OMAP4 " Robert Lee
2012-03-01 0:42 ` [PATCH v7 8/9] ARM: shmobile: Consolidate " Robert Lee
2012-03-01 0:42 ` Robert Lee [this message]
2012-03-01 20:57 ` [PATCH v7 0/9] Consolidate cpuidle functionality Rob Lee
2012-03-05 16:43 ` Daniel Lezcano
2012-03-05 21:33 ` Kevin Hilman
2012-03-09 1:58 ` [git pull] " Rob Lee
2012-03-09 6:40 ` Stephen Rothwell
2012-03-12 18:45 ` Rob Lee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330562578-3410-10-git-send-email-rob.lee@linaro.org \
--to=rob.lee@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).