Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1a86831 authored by Mark Brown's avatar Mark Brown
Browse files

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

drivers/regulator/core.c

+2 −3
Original line number Diff line number Diff line
@@ -3160,8 +3160,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;
@@ -3293,7 +3292,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);