Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 09:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

regmap: Clean up _regmap_update_bits()

Browse Source 
Since sometimes the 'config' parameter has no use, it should be NULL.
And make the code simplifier.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Xiubo Li 2014-02-20 08:50:10 +08:00 committed by Mark Brown
parent d4807ad2c4
commit e2f74dc673
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/base/regmap/regmap.c
View File

@ -1969,9 +1969,11 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg,
if (tmp != orig) { if (tmp != orig) {
ret = _regmap_write(map, reg, tmp); ret = _regmap_write(map, reg, tmp);
*change = true; if (change)
*change = true;
} else { } else {
*change = false; if (change)
*change = false;
} }
return ret; return ret;
@ -1990,11 +1992,10 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg,
int regmap_update_bits(struct regmap *map, unsigned int reg, int regmap_update_bits(struct regmap *map, unsigned int reg,
unsigned int mask, unsigned int val) unsigned int mask, unsigned int val)
{ {
bool change;
int ret; int ret;
map->lock(map->lock_arg); map->lock(map->lock_arg);
ret = _regmap_update_bits(map, reg, mask, val, &change); ret = _regmap_update_bits(map, reg, mask, val, NULL);
map->unlock(map->lock_arg); map->unlock(map->lock_arg);
return ret; return ret;
@ -2019,14 +2020,13 @@ EXPORT_SYMBOL_GPL(regmap_update_bits);
int regmap_update_bits_async(struct regmap *map, unsigned int reg, int regmap_update_bits_async(struct regmap *map, unsigned int reg,
unsigned int mask, unsigned int val) unsigned int mask, unsigned int val)
{ {
bool change;
int ret; int ret;
map->lock(map->lock_arg); map->lock(map->lock_arg);
map->async = true; map->async = true;
ret = _regmap_update_bits(map, reg, mask, val, &change); ret = _regmap_update_bits(map, reg, mask, val, NULL);
map->async = false; map->async = false;