regulator: core: Simplify error flow in _regulator_do_set_voltage()

Matthias Kaehlcke · broonie · commit 31dfe686ed0b · 2016-09-16T17:33:40.000+01:00
If the voltage can not be set jump to the end of the function. This
avoids having to check for an error multiple times and eliminates one
level of nesting in a follow-up change.

Signed-off-by: Matthias Kaehlcke &lt;mka@chromium.org&gt;
Signed-off-by: Mark Brown &lt;broonie@kernel.org&gt;
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
@@ -2800,8 +2800,11 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
 		ret = -EINVAL;
 	}
 
+	if (ret)
+		goto out;
+
 	/* Call set_voltage_time_sel if successfully obtained old_selector */
-	if (ret == 0 && !rdev->constraints->ramp_disable && old_selector >= 0
+	if (!rdev->constraints->ramp_disable && old_selector >= 0
 		&& old_selector != selector) {
 
 		delay = ops->set_voltage_time_sel(rdev,
@@ -2821,13 +2824,14 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
 		}
 	}
 
-	if (ret == 0 && best_val >= 0) {
+	if (best_val >= 0) {
 		unsigned long data = best_val;
 
 		_notifier_call_chain(rdev, REGULATOR_EVENT_VOLTAGE_CHANGE,
 				     (void *)data);
 	}
 
+out:
 	trace_regulator_set_voltage_complete(rdev_get_name(rdev), best_val);
 
 	return ret;

Original file line number	Diff line number	Diff line change
`@@ -2800,8 +2800,11 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,`
`2800`	`2800`	`ret = -EINVAL;`
`2801`	`2801`	`}`
`2802`	`2802`
	`2803`	`+ if (ret)`
	`2804`	`+ goto out;`
	`2805`	`+`
`2803`	`2806`	`/* Call set_voltage_time_sel if successfully obtained old_selector */`
`2804`		`- if (ret == 0 && !rdev->constraints->ramp_disable && old_selector >= 0`
	`2807`	`+ if (!rdev->constraints->ramp_disable && old_selector >= 0`
`2805`	`2808`	`&& old_selector != selector) {`
`2806`	`2809`
`2807`	`2810`	`delay = ops->set_voltage_time_sel(rdev,`
`@@ -2821,13 +2824,14 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,`
`2821`	`2824`	`}`
`2822`	`2825`	`}`
`2823`	`2826`
`2824`		`- if (ret == 0 && best_val >= 0) {`
	`2827`	`+ if (best_val >= 0) {`
`2825`	`2828`	`unsigned long data = best_val;`
`2826`	`2829`
`2827`	`2830`	`_notifier_call_chain(rdev, REGULATOR_EVENT_VOLTAGE_CHANGE,`
`2828`	`2831`	`(void *)data);`
`2829`	`2832`	`}`
`2830`	`2833`
	`2834`	`+out:`
`2831`	`2835`	`trace_regulator_set_voltage_complete(rdev_get_name(rdev), best_val);`
`2832`	`2836`
`2833`	`2837`	`return ret;`