Merge branch 'regmap-4.20' into regmap-next

1 files changed, 12 insertions, 6 deletions

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 0360a90ad6b6..0d9ad7c07d51 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -35,6 +35,16 @@
  */
 #undef LOG_DEVICE
 
+#ifdef LOG_DEVICE
+static inline bool regmap_should_log(struct regmap *map)
+{
+        return (map->dev && strcmp(dev_name(map->dev), LOG_DEVICE) == 0);
+}
+#else
+static inline bool regmap_should_log(struct regmap *map) { return false; }
+#endif
+
+
 static int _regmap_update_bits(struct regmap *map, unsigned int reg,
                                unsigned int mask, unsigned int val,
                                bool *change, bool force_write);
@@ -1755,10 +1765,8 @@ int _regmap_write(struct regmap *map, unsigned int reg,
                 }
         }
 
-#ifdef LOG_DEVICE
-        if (map->dev && strcmp(dev_name(map->dev), LOG_DEVICE) == 0)
+        if (regmap_should_log(map))
                 dev_info(map->dev, "%x <= %x\n", reg, val);
-#endif
 
         trace_regmap_reg_write(map, reg, val);
 
@@ -2450,10 +2458,8 @@ static int _regmap_read(struct regmap *map, unsigned int reg,
 
         ret = map->reg_read(context, reg, val);
         if (ret == 0) {
-#ifdef LOG_DEVICE
-                if (map->dev && strcmp(dev_name(map->dev), LOG_DEVICE) == 0)
+                if (regmap_should_log(map))
                         dev_info(map->dev, "%x => %x\n", reg, *val);
-#endif
 
                 trace_regmap_reg_read(map, reg, *val);