In the next patch, we will support different cpuidle drivers tied with a cpu. In this case we should move the refcount to the cpuidle_driver structure to handle several drivers at a time.
Signed-off-by: Daniel Lezcano daniel.lezcano@linaro.org --- drivers/cpuidle/driver.c | 11 ++++++----- include/linux/cpuidle.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c index 87db387..676febd 100644 --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -16,7 +16,6 @@
static struct cpuidle_driver *cpuidle_curr_driver; DEFINE_SPINLOCK(cpuidle_driver_lock); -int cpuidle_driver_refcount;
static void set_power_states(struct cpuidle_driver *drv) { @@ -92,7 +91,7 @@ void cpuidle_unregister_driver(struct cpuidle_driver *drv)
spin_lock(&cpuidle_driver_lock);
- if (!WARN_ON(cpuidle_driver_refcount > 0)) + if (!WARN_ON(drv->refcnt > 0)) cpuidle_curr_driver = NULL;
spin_unlock(&cpuidle_driver_lock); @@ -106,7 +105,7 @@ struct cpuidle_driver *cpuidle_driver_ref(void) spin_lock(&cpuidle_driver_lock);
drv = cpuidle_curr_driver; - cpuidle_driver_refcount++; + drv->refcnt++;
spin_unlock(&cpuidle_driver_lock); return drv; @@ -114,10 +113,12 @@ struct cpuidle_driver *cpuidle_driver_ref(void)
void cpuidle_driver_unref(void) { + struct cpuidle_driver *drv = cpuidle_curr_driver; + spin_lock(&cpuidle_driver_lock);
- if (!WARN_ON(cpuidle_driver_refcount <= 0)) - cpuidle_driver_refcount--; + if (drv && !WARN_ON(drv->refcnt <= 0)) + drv->refcnt--;
spin_unlock(&cpuidle_driver_lock); } diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 279b1ea..a4ff9f8 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -131,6 +131,7 @@ static inline int cpuidle_get_last_residency(struct cpuidle_device *dev) struct cpuidle_driver { const char *name; struct module *owner; + int refcnt;
unsigned int power_specified:1; /* set to 1 to use the core cpuidle time keeping (for all states). */