cpuidle: move driver's refcount to cpuidle

We want to support different cpuidle drivers co-existing together.
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>
Acked-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
index 87db3877fead..39ba8e181e96 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)
 {
@@ -61,6 +60,8 @@ int cpuidle_register_driver(struct cpuidle_driver *drv)
         if (!drv->power_specified)
                 set_power_states(drv);
 
+        drv->refcnt = 0;
+
         cpuidle_curr_driver = drv;
 
         spin_unlock(&cpuidle_driver_lock);
@@ -92,7 +93,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 +107,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 +115,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);
 }