From 1fff23d7feb30caea1cf4aeef9026128d74a5d80 Mon Sep 17 00:00:00 2001 From: Jonas Aaberg Date: Fri, 10 Feb 2012 13:32:42 +0100 Subject: regulator: core: use usleep_range instead of msleep/udelay mix ST-Ericsson Linux next: - ST-Ericsson ID: 370799 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I6f1655e9f435cc26e6da80a198491f0139b5ca63 Signed-off-by: Jonas Aaberg Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/48708 Reviewed-by: QABUILD Reviewed-by: Bengt JONSSON --- drivers/regulator/core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 07db80ca4ee..bc6c12c8a76 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1520,12 +1520,8 @@ static int _regulator_enable(struct regulator_dev *rdev) trace_regulator_enable_delay(rdev_get_name(rdev)); - if (delay >= 1000) { - mdelay(delay / 1000); - udelay(delay % 1000); - } else if (delay) { - udelay(delay); - } + if (delay) + usleep_range(delay, delay); trace_regulator_enable_complete(rdev_get_name(rdev)); -- cgit v1.2.3