hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
This commit is contained in:
Mark Brown 2012-05-14 00:40:14 +01:00
parent f0b067d9b6
commit b1a868310e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/regulator/core.c
View File

@ -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)
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);