2012-05-14 12:23:04

by Mark Brown

Subject: [PATCH] regulator: core: Don't open code _regulator_is_enabled()

Signed-off-by: Mark Brown <[email protected]>
---
drivers/regulator/core.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 28b9c31..56768bd 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3163,8 +3163,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
goto scrub;

/* Enable supply if rail is enabled */
- if (rdev->desc->ops->is_enabled &&
- rdev->desc->ops->is_enabled(rdev)) {
+ if (_regulator_is_enabled(rdev)) {
ret = regulator_enable(rdev->supply);
if (ret < 0)
goto scrub;
@@ -3296,7 +3295,7 @@ int regulator_suspend_finish(void)
goto unlock;
if (!ops->disable)
goto unlock;
- if (ops->is_enabled && !ops->is_enabled(rdev))
+ if (!_regulator_is_enabled(rdev))
goto unlock;

error = ops->disable(rdev);
--
1.7.10

2012-05-14 12:43:08

by Liam Girdwood

Subject: Re: [PATCH] regulator: core: Don't open code _regulator_is_enabled()

On Mon, 2012-05-14 at 13:22 +0100, Mark Brown wrote:
> Signed-off-by: Mark Brown <[email protected]>
> ---
> drivers/regulator/core.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)

Acked-by: Liam Girdwood <[email protected]>