aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/regmap/regmap.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-10-06 06:25:43 -0700
committerDavid S. Miller <davem@davemloft.net>2015-10-06 06:25:43 -0700
commit21c4c073f14509d685ed219aa3c76362a7bfa0ac (patch)
tree46e100b34be7598be3ac8e4f8793f04597828819 /drivers/base/regmap/regmap.c
parentRevert "net: Microchip encx24j600 driver" (diff)
downloadlinux-dev-21c4c073f14509d685ed219aa3c76362a7bfa0ac.tar.xz
linux-dev-21c4c073f14509d685ed219aa3c76362a7bfa0ac.zip
Revert "regmap: Allow installing custom reg_update_bits function"
This reverts commit 7741c373cf3ea1f5383fa97fb7a640a429d3dd7c.
Diffstat (limited to '')
-rw-r--r--drivers/base/regmap/regmap.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 70387c9f281b..afaf56200674 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -619,7 +619,6 @@ struct regmap *__regmap_init(struct device *dev,
goto skip_format_initialization;
} else {
map->reg_read = _regmap_bus_read;
- map->reg_update_bits = bus->reg_update_bits;
}
reg_endian = regmap_get_reg_endian(bus, config);
@@ -2510,30 +2509,6 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg,
int ret;
unsigned int tmp, orig;
- if (map->reg_update_bits) {
- ret = map->reg_update_bits(map->bus_context, reg, mask, val,
- change, force_write);
- if (ret != 0)
- return ret;
-
- /* Fix up the cache by read/modify/write */
- if (!map->cache_bypass && !map->defer_caching) {
- ret = regcache_read(map, reg, &orig);
- if (ret != 0)
- return ret;
-
- tmp = orig & ~mask;
- tmp |= val & mask;
-
- ret = regcache_write(map, reg, tmp);
- if (ret != 0)
- return ret;
- if (map->cache_only)
- map->cache_dirty = true;
- }
- return ret;
- }
-
ret = _regmap_read(map, reg, &orig);
if (ret != 0)
return ret;