From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 21 May 2012 01:39:08 +0000 (+0800)
Subject: regulator: ab8500: Let regulator core handle the case no delay for setting new voltag... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6333e9ddf4787ec42cbb4cbb482168094e54b337;p=deliverable%2Flinux.git

regulator: ab8500: Let regulator core handle the case no delay for setting new voltage if regulator is off

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index da883e661b38..f15807449011 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -256,14 +256,7 @@ static int ab8500_regulator_set_voltage_time_sel(struct regulator_dev *rdev,
 					     unsigned int new_sel)
 {
 	struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);
-	int ret;
 
-	/* If the regulator isn't on, it won't take time here */
-	ret = ab8500_regulator_is_enabled(rdev);
-	if (ret < 0)
-		return ret;
-	if (!ret)
-		return 0;
 	return info->delay;
 }