From: Robert Lee <rob.lee@linaro.org>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 6/9] ARM: omap: Consolidate OMAP3 time keeping and irq enable
Date: Thu, 01 Mar 2012 00:42:55 +0000 [thread overview]
Message-ID: <1330562578-3410-7-git-send-email-rob.lee@linaro.org> (raw)
In-Reply-To: <1330562578-3410-1-git-send-email-rob.lee@linaro.org>
Use core cpuidle timekeeping and irqen wrapper and remove that
handling from this code.
Signed-off-by: Robert Lee <rob.lee@linaro.org>
---
arch/arm/mach-omap2/cpuidle34xx.c | 42 +++++++++++++++----------------------
1 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index 464cffd..5358664 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -87,29 +87,14 @@ static int _cpuidle_deny_idle(struct powerdomain *pwrdm,
return 0;
}
-/**
- * omap3_enter_idle - Programs OMAP3 to enter the specified state
- * @dev: cpuidle device
- * @drv: cpuidle driver
- * @index: the index of state to be entered
- *
- * Called from the CPUidle framework to program the device to the
- * specified target state selected by the governor.
- */
-static int omap3_enter_idle(struct cpuidle_device *dev,
+static int __omap3_enter_idle(struct cpuidle_device *dev,
struct cpuidle_driver *drv,
int index)
{
struct omap3_idle_statedata *cx cpuidle_get_statedata(&dev->states_usage[index]);
- struct timespec ts_preidle, ts_postidle, ts_idle;
u32 mpu_state = cx->mpu_state, core_state = cx->core_state;
- int idle_time;
-
- /* Used to keep track of the total time in idle */
- getnstimeofday(&ts_preidle);
- local_irq_disable();
local_fiq_disable();
pwrdm_set_next_pwrst(mpu_pd, mpu_state);
@@ -148,22 +133,29 @@ static int omap3_enter_idle(struct cpuidle_device *dev,
}
return_sleep_time:
- getnstimeofday(&ts_postidle);
- ts_idle = timespec_sub(ts_postidle, ts_preidle);
- local_irq_enable();
local_fiq_enable();
- idle_time = ts_idle.tv_nsec / NSEC_PER_USEC + ts_idle.tv_sec * \
- USEC_PER_SEC;
-
- /* Update cpuidle counters */
- dev->last_residency = idle_time;
-
return index;
}
/**
+ * omap3_enter_idle - Programs OMAP3 to enter the specified state
+ * @dev: cpuidle device
+ * @drv: cpuidle driver
+ * @index: the index of state to be entered
+ *
+ * Called from the CPUidle framework to program the device to the
+ * specified target state selected by the governor.
+ */
+static inline int omap3_enter_idle(struct cpuidle_device *dev,
+ struct cpuidle_driver *drv,
+ int index)
+{
+ return cpuidle_wrap_enter(dev, drv, index, __omap3_enter_idle);
+}
+
+/**
* next_valid_state - Find next valid C-state
* @dev: cpuidle device
* @drv: cpuidle driver
--
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 ` Robert Lee [this message]
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 ` [PATCH v7 9/9] SH: " Robert Lee
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-7-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).