Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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: Krystian Garbaciak <krystian.garbaciak@diasemi.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Krystian Garbaciak 2012-06-15 11:23:56 +01:00 committed by Mark Brown
parent 485802a6c5
commit fc3ebd788e
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/base/regmap/regmap.c
View file

@ -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);