diff options
| author | Yadwinder Singh Brar <yadi.brar@samsung.com> | 2013-06-29 18:21:19 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-15 11:27:48 +0100 |
| commit | 5b175952011adae30b531ab89cc24acb173b2ce4 (patch) | |
| tree | 3d32b5482cb43df0958ca9e93381249c889fe9ee /drivers/regulator/core.c | |
| parent | 1653ccf4c52df6a4abe8ec2f33f2cb2896d129ea (diff) | |
| download | linux-5b175952011adae30b531ab89cc24acb173b2ce4.tar.bz2 | |
regulator: core: Remove redundant checks
In function _regulator_do_set_voltage(), old_selector gets intialised only
if (_regulator_is_enabled(rdev) && rdev->desc->ops->set_voltage_time_sel &&
rdev->desc->ops->get_voltage_sel)) is true.
Before calling set_voltage_time_sel() we checks if (old_selector >= 0) and it
will true if it got intialised properly. so we don't need to check again
_regulator_is_enabled(rdev) && rdev->desc->ops->set_voltage_time_sel before
calling set_voltage_time_sel().
Signed-off-by: Yadwinder Singh Brar <yadi.brar@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 6e6371c2346c..15368f35bbdf 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2439,9 +2439,8 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, } /* Call set_voltage_time_sel if successfully obtained old_selector */ - if (ret == 0 && !rdev->constraints->ramp_disable && - _regulator_is_enabled(rdev) && old_selector >= 0 && - old_selector != selector && rdev->desc->ops->set_voltage_time_sel) { + if (ret == 0 && !rdev->constraints->ramp_disable && old_selector >= 0 + && old_selector != selector) { delay = rdev->desc->ops->set_voltage_time_sel(rdev, old_selector, selector); |