1 files changed, 8 insertions, 22 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 019a8a42ac18..944887578d66 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -52,7 +52,6 @@ struct regulator {
         int uA_load;
         int min_uV;
         int max_uV;
-        int enabled; /* count of client enables */
         char *supply_name;
         struct device_attribute dev_attr;
         struct regulator_dev *rdev;
@@ -815,6 +814,7 @@ static int set_machine_constraints(struct regulator_dev *rdev,
                         rdev->constraints = NULL;
                         goto out;
                 }
+                rdev->use_count = 1;
         }
 
         print_constraints(rdev);
@@ -1068,10 +1068,6 @@ void regulator_put(struct regulator *regulator)
         mutex_lock(&regulator_list_mutex);
         rdev = regulator->rdev;
 
-        if (WARN(regulator->enabled, "Releasing supply %s while enabled\n",
-                               regulator->supply_name))
-                _regulator_disable(rdev);
-
         /* remove any sysfs entries */
         if (regulator->dev) {
                 sysfs_remove_link(&rdev->dev.kobj, regulator->supply_name);
@@ -1146,12 +1142,7 @@ int regulator_enable(struct regulator *regulator)
         int ret = 0;
 
         mutex_lock(&rdev->mutex);
-        if (regulator->enabled == 0)
-                ret = _regulator_enable(rdev);
-        else if (regulator->enabled < 0)
-                ret = -EIO;
-        if (ret == 0)
-                regulator->enabled++;
+        ret = _regulator_enable(rdev);
         mutex_unlock(&rdev->mutex);
         return ret;
 }
@@ -1162,6 +1153,11 @@ static int _regulator_disable(struct regulator_dev *rdev)
 {
         int ret = 0;
 
+        if (WARN(rdev->use_count <= 0,
+                        "unbalanced disables for %s\n",
+                        rdev->desc->name))
+                return -EIO;
+
         /* are we the last user and permitted to disable ? */
         if (rdev->use_count == 1 && !rdev->constraints->always_on) {
 
@@ -1210,16 +1206,7 @@ int regulator_disable(struct regulator *regulator)
         int ret = 0;
 
         mutex_lock(&rdev->mutex);
-        if (regulator->enabled == 1) {
-                ret = _regulator_disable(rdev);
-                if (ret == 0)
-                        regulator->uA_load = 0;
-        } else if (WARN(regulator->enabled <= 0,
-                        "unbalanced disables for supply %s\n",
-                        regulator->supply_name))
-                ret = -EIO;
-        if (ret == 0)
-                regulator->enabled--;
+        ret = _regulator_disable(rdev);
         mutex_unlock(&rdev->mutex);
         return ret;
 }
@@ -1266,7 +1253,6 @@ int regulator_force_disable(struct regulator *regulator)
         int ret;
 
         mutex_lock(&regulator->rdev->mutex);
-        regulator->enabled = 0;
         regulator->uA_load = 0;
         ret = _regulator_force_disable(regulator->rdev);
         mutex_unlock(&regulator->rdev->mutex);