Commit b1a86831 authored by Mark Brown's avatar Mark Brown

regulator: core: Don't open code _regulator_is_enabled()

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent f0b067d9
...@@ -3160,8 +3160,7 @@ regulator_register(const struct regulator_desc *regulator_desc, ...@@ -3160,8 +3160,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
goto scrub; goto scrub;
/* Enable supply if rail is enabled */ /* Enable supply if rail is enabled */
if (rdev->desc->ops->is_enabled && if (_regulator_is_enabled(rdev)) {
rdev->desc->ops->is_enabled(rdev)) {
ret = regulator_enable(rdev->supply); ret = regulator_enable(rdev->supply);
if (ret < 0) if (ret < 0)
goto scrub; goto scrub;
...@@ -3293,7 +3292,7 @@ int regulator_suspend_finish(void) ...@@ -3293,7 +3292,7 @@ int regulator_suspend_finish(void)
goto unlock; goto unlock;
if (!ops->disable) if (!ops->disable)
goto unlock; goto unlock;
if (ops->is_enabled && !ops->is_enabled(rdev)) if (!_regulator_is_enabled(rdev))
goto unlock; goto unlock;
error = ops->disable(rdev); error = ops->disable(rdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment