regulator: core: don't return error with inadequate reason (57776617) · Commits · 戴 / test

drms_uA_update() always returns failure when it cannot find regulator's input voltage. But if hardware supports load configuration with ops->set_load() and the input regulator isn't specified with valid reason such as the input regulator is battery, not finding input voltage is normal so such case should not return with an error. Avoid such inadequate error return by checking input/output voltages only when drms_uA_update() is about to configure load with enum based ops->set_mode(). Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: linux-kernel@vger.kernel.org Signed-off-by:

Joonwoo Park <joonwoop@codeaurora.org> Signed-off-by:

Mark Brown <broonie@kernel.org>

drivers/regulator/core.c

+18 −18

Original line number	Diff line number	Diff line
		@@ -679,6 +679,18 @@ static int drms_uA_update(struct regulator_dev *rdev)
		!rdev->desc->ops->set_load)
		return -EINVAL;

		/* calc total requested load */
		list_for_each_entry(sibling, &rdev->consumer_list, list)
		current_uA += sibling->uA_load;

		current_uA += rdev->constraints->system_load;

		if (rdev->desc->ops->set_load) {
		/* set the optimum mode for our new total regulator load */
		err = rdev->desc->ops->set_load(rdev, current_uA);
		if (err < 0)
		rdev_err(rdev, "failed to set load %d\n", current_uA);
		} else {
		/* get output voltage */
		output_uV = _regulator_get_voltage(rdev);
		if (output_uV <= 0) {
		@@ -697,18 +709,6 @@ static int drms_uA_update(struct regulator_dev *rdev)
		return -EINVAL;
		}

		/* calc total requested load */
		list_for_each_entry(sibling, &rdev->consumer_list, list)
		current_uA += sibling->uA_load;

		current_uA += rdev->constraints->system_load;

		if (rdev->desc->ops->set_load) {
		/* set the optimum mode for our new total regulator load */
		err = rdev->desc->ops->set_load(rdev, current_uA);
		if (err < 0)
		rdev_err(rdev, "failed to set load %d\n", current_uA);
		} else {
		/* now get the optimum mode for our new total regulator load */
		mode = rdev->desc->ops->get_optimum_mode(rdev, input_uV,
		output_uV, current_uA);

Admin message