From: Niklas Cassel Date: Mon, 18 Feb 2019 19:29:14 +0000 (+0100) Subject: regulator: core: Drop lockdep annotation in drms_uA_update() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c407438f8795e6b403674b51fbdf5b3d66f811a4;p=openwrt%2Fstaging%2Fblogic.git regulator: core: Drop lockdep annotation in drms_uA_update() 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 Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index defde9125a50..3e9aa0d0b471 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -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.