Merge remote-tracking branch 'regmap/topic/core' into regmap-next

2 files changed, 11 insertions, 8 deletions

diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index c5471cd6ebb7..45d812c0ea77 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -511,7 +511,7 @@ void regmap_debugfs_init(struct regmap *map, const char *name)
         debugfs_create_file("range", 0400, map->debugfs,
                             map, &regmap_reg_ranges_fops);
 
-        if (map->max_register) {
+        if (map->max_register || regmap_readable(map, 0)) {
                 debugfs_create_file("registers", 0400, map->debugfs,
                                     map, &regmap_map_fops);
                 debugfs_create_file("access", 0400, map->debugfs,
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 6a19515f8a45..92d9b79ff93e 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -718,7 +718,7 @@ skip_format_initialization:
                 new->window_start = range_cfg->window_start;
                 new->window_len = range_cfg->window_len;
 
-                if (_regmap_range_add(map, new) == false) {
+                if (!_regmap_range_add(map, new)) {
                         dev_err(map->dev, "Failed to add range %d\n", i);
                         kfree(new);
                         goto err_range;
@@ -1736,6 +1736,9 @@ static int _regmap_read(struct regmap *map, unsigned int reg,
         if (map->cache_only)
                 return -EBUSY;
 
+        if (!regmap_readable(map, reg))
+                return -EIO;
+
         ret = map->reg_read(context, reg, val);
         if (ret == 0) {
 #ifdef LOG_DEVICE
@@ -1966,9 +1969,11 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg,
 
         if (tmp != orig) {
                 ret = _regmap_write(map, reg, tmp);
-                *change = true;
+                if (change)
+                        *change = true;
         } else {
-                *change = false;
+                if (change)
+                        *change = false;
         }
 
         return ret;
@@ -1987,11 +1992,10 @@ static 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)
 {
-        bool change;
         int ret;
 
         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);
 
         return ret;
@@ -2016,14 +2020,13 @@ EXPORT_SYMBOL_GPL(regmap_update_bits);
 int regmap_update_bits_async(struct regmap *map, unsigned int reg,
                              unsigned int mask, unsigned int val)
 {
-        bool change;
         int ret;
 
         map->lock(map->lock_arg);
 
         map->async = true;
 
-        ret = _regmap_update_bits(map, reg, mask, val, &change);
+        ret = _regmap_update_bits(map, reg, mask, val, NULL);
 
         map->async = false;