Revert "regmap: Allow installing custom reg_update_bits function"

This reverts commit 7741c373cf3ea1f5383fa97fb7a640a429d3dd7c.

diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 4036d7a90f638e92322b01e14b8acd8777ce74d1..cc557886ab2377a550c1ae529b6ecee23380161f 100644 (file)
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -98,9 +98,6 @@ struct regmap {
 
        int (*reg_read)(void *context, unsigned int reg, unsigned int *val);
        int (*reg_write)(void *context, unsigned int reg, unsigned int val);
-       int (*reg_update_bits)(void *context, unsigned int reg,
-                              unsigned int mask, unsigned int val,
-                              bool *change, bool force_write);
 
        bool defer_caching;
 

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 70387c9f281b8456a66167a3fa6898df691b7fe4..afaf56200674a29517678af763bc9a084659224b 100644 (file)
--- 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;

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 4d3a3b1680bb440852c3bae3fb72d5bd6b500f30..8fc0bfd8edc4434fc79fda8591323d6be41f0645 100644 (file)
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -296,9 +296,6 @@ typedef int (*regmap_hw_reg_read)(void *context, unsigned int reg,
                                  unsigned int *val);
 typedef int (*regmap_hw_reg_write)(void *context, unsigned int reg,
                                   unsigned int val);
-typedef int (*regmap_hw_reg_update_bits)(void *context, unsigned int reg,
-                                        unsigned int mask, unsigned int val,
-                                        bool *change, bool force_write);
 typedef struct regmap_async *(*regmap_hw_async_alloc)(void);
 typedef void (*regmap_hw_free_context)(void *context);
 
@@ -338,7 +335,6 @@ struct regmap_bus {
        regmap_hw_gather_write gather_write;
        regmap_hw_async_write async_write;
        regmap_hw_reg_write reg_write;
-       regmap_hw_reg_update_bits reg_update_bits;
        regmap_hw_read read;
        regmap_hw_reg_read reg_read;
        regmap_hw_free_context free_context;