regulator: core: Drop lockdep annotation in drms_uA_update()
authorNiklas Cassel <niklas.cassel@linaro.org>
Mon, 18 Feb 2019 19:29:14 +0000 (20:29 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 19 Feb 2019 11:01:44 +0000 (11:01 +0000)
commit e5e21f70bfd3 ("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: e5e21f70bfd3 ("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>
drivers/regulator/core.c

index defde9125a509ec5b1a8171a1aa12586008dece7..3e9aa0d0b47183e27a9347efd24638103203c3e0 100644 (file)
@@ -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.