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

Commit fc3ebd78 authored by Krystian Garbaciak's avatar Krystian Garbaciak Committed by Mark Brown
Browse files

regmap: Move lock out from internal function _regmap_update_bits(). 



Locks are moved to regmap_update_bits(), which allows to reenter internal
function _regmap_update_bits() from inside of regmap read/write routines.

Signed-off-by: default avatarKrystian Garbaciak <krystian.garbaciak@diasemi.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 485802a6

drivers/base/regmap/regmap.c

+14 −8
Original line number Diff line number Diff line
@@ -982,11 +982,9 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg, 
	int ret;

	unsigned int tmp, orig;



	map->lock(map);



	ret = _regmap_read(map, reg, &orig);

	if (ret != 0)

		goto out;

		return ret;



	tmp = orig & ~mask;

	tmp |= val & mask;
@@ -998,9 +996,6 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg, 
		*change = false;

	}



out:

	map->unlock(map);



	return ret;

}
@@ -1018,7 +1013,13 @@ int regmap_update_bits(struct regmap *map, unsigned int reg, 
		       unsigned int mask, unsigned int val)

{

	bool change;

	return _regmap_update_bits(map, reg, mask, val, &change);

	int ret;



	map->lock(map);

	ret = _regmap_update_bits(map, reg, mask, val, &change);

	map->unlock(map);



	return ret;

}

EXPORT_SYMBOL_GPL(regmap_update_bits);
@@ -1038,7 +1039,12 @@ int regmap_update_bits_check(struct regmap *map, unsigned int reg, 
			     unsigned int mask, unsigned int val,

			     bool *change)

{

	return _regmap_update_bits(map, reg, mask, val, change);

	int ret;



	map->lock(map);

	ret = _regmap_update_bits(map, reg, mask, val, change);

	map->unlock(map);

	return ret;

}

EXPORT_SYMBOL_GPL(regmap_update_bits_check);