From 1d6a19330ecbf9f9d6a2c467987dcb3c008548a2 Mon Sep 17 00:00:00 2001 From: Deepthi Dharwar Date: Fri, 28 Oct 2011 16:20:24 +0530 Subject: [PATCH] --- yaml --- r: 275031 b: refs/heads/master c: b25edc42bfb9602f0503474b2c94701d5536ce60 h: refs/heads/master i: 275029: 89f715a04a7efa95ed3d065ab3f214f225d213f5 275027: 0fe0dbf8bbca6a7c3522c7f9d142479eac8cf211 275023: 773910f5fc16af31b58631092f429820dc467c00 v: v3 --- [refs] | 2 +- trunk/drivers/cpuidle/cpuidle.c | 10 ---------- trunk/drivers/cpuidle/governors/menu.c | 2 -- trunk/include/linux/cpuidle.h | 3 --- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/[refs] b/[refs] index f38e3fd15247..4a8e0ac55dbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e978aa7d7d57d04eb5f88a7507c4fb98577def77 +refs/heads/master: b25edc42bfb9602f0503474b2c94701d5536ce60 diff --git a/trunk/drivers/cpuidle/cpuidle.c b/trunk/drivers/cpuidle/cpuidle.c index 88bd12104396..f66bcf9bfe93 100644 --- a/trunk/drivers/cpuidle/cpuidle.c +++ b/trunk/drivers/cpuidle/cpuidle.c @@ -83,16 +83,6 @@ int cpuidle_idle_call(void) hrtimer_peek_ahead_timers(); #endif - /* - * Call the device's prepare function before calling the - * governor's select function. ->prepare gives the device's - * cpuidle driver a chance to update any dynamic information - * of its cpuidle states for the current idle period, e.g. - * state availability, latencies, residencies, etc. - */ - if (dev->prepare) - dev->prepare(dev); - /* ask the governor for the next state */ next_state = cpuidle_curr_governor->select(dev); if (need_resched()) { diff --git a/trunk/drivers/cpuidle/governors/menu.c b/trunk/drivers/cpuidle/governors/menu.c index e4b200c5b441..af724e823c8e 100644 --- a/trunk/drivers/cpuidle/governors/menu.c +++ b/trunk/drivers/cpuidle/governors/menu.c @@ -288,8 +288,6 @@ static int menu_select(struct cpuidle_device *dev) for (i = CPUIDLE_DRIVER_STATE_START; i < dev->state_count; i++) { struct cpuidle_state *s = &dev->states[i]; - if (s->flags & CPUIDLE_FLAG_IGNORE) - continue; if (s->target_residency > data->predicted_us) continue; if (s->exit_latency > latency_req) diff --git a/trunk/include/linux/cpuidle.h b/trunk/include/linux/cpuidle.h index 8da811bcdbdb..c6d85cf90eb2 100644 --- a/trunk/include/linux/cpuidle.h +++ b/trunk/include/linux/cpuidle.h @@ -47,7 +47,6 @@ struct cpuidle_state { /* Idle State Flags */ #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */ -#define CPUIDLE_FLAG_IGNORE (0x100) /* ignore during this idle period */ #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000) @@ -93,8 +92,6 @@ struct cpuidle_device { struct completion kobj_unregister; void *governor_data; int safe_state_index; - - int (*prepare) (struct cpuidle_device *dev); }; DECLARE_PER_CPU(struct cpuidle_device *, cpuidle_devices);