aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiubo Li <Li.Xiubo@freescale.com>2014-02-19 19:50:10 -0500
committerMark Brown <broonie@linaro.org>2014-02-19 21:37:39 -0500
commite2f74dc6739731a6b6900946a21ac235181aa60f (patch)
treed731c177155c196dfd7ac4e5b3020b6c32ce85f3
parentd4807ad2c4c0e17b6f00e3be9492c81de0804f40 (diff)
regmap: Clean up _regmap_update_bits()
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>
-rw-r--r--drivers/base/regmap/regmap.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index b897c1a88b56..9a426c081484 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1969,9 +1969,11 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg,
1969 1969
1970 if (tmp != orig) { 1970 if (tmp != orig) {
1971 ret = _regmap_write(map, reg, tmp); 1971 ret = _regmap_write(map, reg, tmp);
1972 *change = true; 1972 if (change)
1973 *change = true;
1973 } else { 1974 } else {
1974 *change = false; 1975 if (change)
1976 *change = false;
1975 } 1977 }
1976 1978
1977 return ret; 1979 return ret;
@@ -1990,11 +1992,10 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg,
1990int regmap_update_bits(struct regmap *map, unsigned int reg, 1992int regmap_update_bits(struct regmap *map, unsigned int reg,
1991 unsigned int mask, unsigned int val) 1993 unsigned int mask, unsigned int val)
1992{ 1994{
1993 bool change;
1994 int ret; 1995 int ret;
1995 1996
1996 map->lock(map->lock_arg); 1997 map->lock(map->lock_arg);
1997 ret = _regmap_update_bits(map, reg, mask, val, &change); 1998 ret = _regmap_update_bits(map, reg, mask, val, NULL);
1998 map->unlock(map->lock_arg); 1999 map->unlock(map->lock_arg);
1999 2000
2000 return ret; 2001 return ret;
@@ -2019,14 +2020,13 @@ EXPORT_SYMBOL_GPL(regmap_update_bits);
2019int regmap_update_bits_async(struct regmap *map, unsigned int reg, 2020int regmap_update_bits_async(struct regmap *map, unsigned int reg,
2020 unsigned int mask, unsigned int val) 2021 unsigned int mask, unsigned int val)
2021{ 2022{
2022 bool change;
2023 int ret; 2023 int ret;
2024 2024
2025 map->lock(map->lock_arg); 2025 map->lock(map->lock_arg);
2026 2026
2027 map->async = true; 2027 map->async = true;
2028 2028
2029 ret = _regmap_update_bits(map, reg, mask, val, &change); 2029 ret = _regmap_update_bits(map, reg, mask, val, NULL);
2030 2030
2031 map->async = false; 2031 map->async = false;
2032 2032