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

Commit 70cfef26 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

regulator: Add lockdep asserts to help detecting locking misuse 



Add lockdep_assert_held_once() to functions explicitly mentioning that
rdev or regulator_list mutex must be held. Using WARN_ONCE shouldn't
pollute the dmesg to much.

The patch (if CONFIG_LOCKDEP enabled) will show warnings in certain
regulators calling regulator_notifier_call_chain() without rdev->mutex
held.

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d770e558

drivers/regulator/core.c

+14 −0
Original line number Diff line number Diff line
@@ -640,6 +640,8 @@ 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);



	/*

	 * first check to see if we can set modes at all, otherwise just

	 * tell the consumer everything is OK.
@@ -760,6 +762,8 @@ static int suspend_set_state(struct regulator_dev *rdev, 
/* locks held by caller */

static int suspend_prepare(struct regulator_dev *rdev, suspend_state_t state)

{

	lockdep_assert_held_once(&rdev->mutex);



	if (!rdev->constraints)

		return -EINVAL;
@@ -1587,6 +1591,8 @@ static void _regulator_put(struct regulator *regulator) 
	if (regulator == NULL || IS_ERR(regulator))

		return;



	lockdep_assert_held_once(&regulator_list_mutex);



	rdev = regulator->rdev;



	debugfs_remove_recursive(regulator->debugfs);
@@ -1965,6 +1971,8 @@ static int _regulator_enable(struct regulator_dev *rdev) 
{

	int ret;



	lockdep_assert_held_once(&rdev->mutex);



	/* check voltage and requested load before enabling */

	if (rdev->constraints &&

	    (rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_DRMS))
@@ -2065,6 +2073,8 @@ static int _regulator_disable(struct regulator_dev *rdev) 
{

	int ret = 0;



	lockdep_assert_held_once(&rdev->mutex);



	if (WARN(rdev->use_count <= 0,

		 "unbalanced disables for %s\n", rdev_get_name(rdev)))

		return -EIO;
@@ -2143,6 +2153,8 @@ static int _regulator_force_disable(struct regulator_dev *rdev) 
{

	int ret = 0;



	lockdep_assert_held_once(&rdev->mutex);



	ret = _notifier_call_chain(rdev, REGULATOR_EVENT_FORCE_DISABLE |

			REGULATOR_EVENT_PRE_DISABLE, NULL);

	if (ret & NOTIFY_STOP_MASK)
@@ -3439,6 +3451,8 @@ EXPORT_SYMBOL_GPL(regulator_bulk_free); 
int regulator_notifier_call_chain(struct regulator_dev *rdev,

				  unsigned long event, void *data)

{

	lockdep_assert_held_once(&rdev->mutex);



	_notifier_call_chain(rdev, event, data);

	return NOTIFY_DONE;