regulator: core.c Only delay when setting voltage requires this

minor optimization: move delay code to where delay is set and
thus where it is used vs in the main line path.

Signed-off-by: Philip Rakity <prakity@marvell.com>
Acked-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index ebdd9e0e14d4..663ebd534ef9 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2155,14 +2155,14 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
                                   delay);
                         delay = 0;
                 }
-        }
 
-        /* Insert any necessary delays */
-        if (delay >= 1000) {
-                mdelay(delay / 1000);
-                udelay(delay % 1000);
-        } else if (delay) {
-                udelay(delay);
+                /* Insert any necessary delays */
+                if (delay >= 1000) {
+                        mdelay(delay / 1000);
+                        udelay(delay % 1000);
+                } else if (delay) {
+                        udelay(delay);
+                }
         }
 
         if (ret == 0 && best_val >= 0)