diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-03 18:49:56 +0100 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-09-22 13:32:40 +0100 |
commit | 9332546fe88fa88bf6a7d9b1dce53ff5d314934e (patch) | |
tree | 494440be4b76ad3dadd71fd426fd2a58d59c8726 | |
parent | f25e0b4fcc38d120e704c377791158c4b2a54daa (diff) | |
download | kernel_samsung_tuna-9332546fe88fa88bf6a7d9b1dce53ff5d314934e.zip kernel_samsung_tuna-9332546fe88fa88bf6a7d9b1dce53ff5d314934e.tar.gz kernel_samsung_tuna-9332546fe88fa88bf6a7d9b1dce53ff5d314934e.tar.bz2 |
regulator: Push locking for regulator_is_enabled() out
Allows use by more of the internal regulator API code.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r-- | drivers/regulator/core.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index dfbf431..60fcd98 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -280,8 +280,13 @@ static ssize_t regulator_state_show(struct device *dev, struct device_attribute *attr, char *buf) { struct regulator_dev *rdev = dev_get_drvdata(dev); + ssize_t ret; + + mutex_lock(&rdev->mutex); + ret = regulator_print_state(buf, _regulator_is_enabled(rdev)); + mutex_unlock(&rdev->mutex); - return regulator_print_state(buf, _regulator_is_enabled(rdev)); + return ret; } static DEVICE_ATTR(state, 0444, regulator_state_show, NULL); @@ -1365,20 +1370,11 @@ EXPORT_SYMBOL_GPL(regulator_force_disable); static int _regulator_is_enabled(struct regulator_dev *rdev) { - int ret; - - mutex_lock(&rdev->mutex); - /* sanity check */ - if (!rdev->desc->ops->is_enabled) { - ret = -EINVAL; - goto out; - } + if (!rdev->desc->ops->is_enabled) + return -EINVAL; - ret = rdev->desc->ops->is_enabled(rdev); -out: - mutex_unlock(&rdev->mutex); - return ret; + return rdev->desc->ops->is_enabled(rdev); } /** @@ -1395,7 +1391,13 @@ out: */ int regulator_is_enabled(struct regulator *regulator) { - return _regulator_is_enabled(regulator->rdev); + int ret; + + mutex_lock(®ulator->rdev->mutex); + ret = _regulator_is_enabled(regulator->rdev); + mutex_unlock(®ulator->rdev->mutex); + + return ret; } EXPORT_SYMBOL_GPL(regulator_is_enabled); |