Commit 5b175952 authored Jun 29, 2013 by Yadwinder Singh Brar Committed by Mark Brown Jul 15, 2013

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>

parent 1653ccf4

drivers/regulator/core.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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);

Admin message