Unverified Commit c407438f authored Feb 18, 2019 by Niklas Cassel Committed by Mark Brown Feb 19, 2019

regulator: core: Drop lockdep annotation in drms_uA_update()



commit e5e21f70 ("regulator: core: Take lock before applying system
load") took the regulator lock before calling drms_uA_update() in order
to silence a lockdep warning during regulator_register().

However, we are not supposed to need locks at this point as the regulator
is in the process of being registered, so there should be no possibility
of concurrent access.

Instead, remove the unnecessary locking and simply drop the lockdep
annotation, since it is no longer valid.

Fixes: e5e21f70 ("regulator: core: Take lock before applying system load")
Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent ef541f73

drivers/regulator/core.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -914,8 +914,6 @@ static int drms_uA_update(struct regulator_dev *rdev)
		int current_uA = 0, output_uV, input_uV, err;
		unsigned int mode;

		lockdep_assert_held_once(&rdev->mutex.base);

		/*
		* first check to see if we can set modes at all, otherwise just
		* tell the consumer everything is OK.

Admin message