From: Markus Elfring <redacted>
Date: Sun, 22 Oct 2017 15:33:06 +0200

Adjust jump targets so that a bit of exception handling can be better
reused at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <redacted>
---
 drivers/devfreq/exynos-bus.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
index 49f68929e024..e38d456b2d7d 100644
--- a/drivers/devfreq/exynos-bus.c
+++ b/drivers/devfreq/exynos-bus.c

@@ -124,34 +124,33 @@ static int exynos_bus_target(struct device *dev, unsigned long *freq, u32 flags)
 
 	if (old_freq < new_freq) {
 		ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
-		if (ret < 0) {
-			dev_err(bus->dev, "failed to set voltage\n");
-			goto out;
-		}
+		if (ret < 0)
+			goto report_failure;
 	}
 
 	ret = clk_set_rate(bus->clk, new_freq);
 	if (ret < 0) {
 		dev_err(dev, "failed to change clock of bus\n");
 		clk_set_rate(bus->clk, old_freq);
-		goto out;
+		goto unlock;
 	}
 
 	if (old_freq > new_freq) {
 		ret = regulator_set_voltage_tol(bus->regulator, new_volt, tol);
-		if (ret < 0) {
-			dev_err(bus->dev, "failed to set voltage\n");
-			goto out;
-		}
+		if (ret < 0)
+			goto report_failure;
 	}
 	bus->curr_freq = new_freq;
 
 	dev_dbg(dev, "Set the frequency of bus (%luHz -> %luHz, %luHz)\n",
 			old_freq, new_freq, clk_get_rate(bus->clk));
-out:
+unlock:
 	mutex_unlock(&bus->lock);
-
 	return ret;
+
+report_failure:
+	dev_err(bus->dev, "failed to set voltage\n");
+	goto unlock;
 }
 
 static int exynos_bus_get_dev_status(struct device *dev,