regmap: debugfs: Factor out debugfs_tot_len calc into a function

In preparation to support the regmap debugfs ranges functionality
factor this code out to a separate function.  We'll need to ensure
that the value has been correctly calculated from two separate places
in the code.

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 14 insertions, 8 deletions

diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index 246f459e9170..78d5f20c5f5b 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -155,6 +155,19 @@ static unsigned int regmap_debugfs_get_dump_start(struct regmap *map,
         return ret;
 }
 
+static inline void regmap_calc_tot_len(struct regmap *map,
+                                       void *buf, size_t count)
+{
+        /* Calculate the length of a fixed format  */
+        if (!map->debugfs_tot_len) {
+                map->debugfs_reg_len = regmap_calc_reg_len(map->max_register,
+                                                           buf, count);
+                map->debugfs_val_len = 2 * map->format.val_bytes;
+                map->debugfs_tot_len = map->debugfs_reg_len +
+                        map->debugfs_val_len + 3;      /* : \n */
+        }
+}
+
 static ssize_t regmap_read_debugfs(struct regmap *map, unsigned int from,
                                    unsigned int to, char __user *user_buf,
                                    size_t count, loff_t *ppos)
@@ -173,14 +186,7 @@ static ssize_t regmap_read_debugfs(struct regmap *map, unsigned int from,
         if (!buf)
                 return -ENOMEM;
 
-        /* Calculate the length of a fixed format  */
-        if (!map->debugfs_tot_len) {
-                map->debugfs_reg_len = regmap_calc_reg_len(map->max_register,
-                                                           buf, count);
-                map->debugfs_val_len = 2 * map->format.val_bytes;
-                map->debugfs_tot_len = map->debugfs_reg_len +
-                        map->debugfs_val_len + 3;      /* : \n */
-        }
+        regmap_calc_tot_len(map, buf, count);
 
         /* Work out which register we're starting at */
         start_reg = regmap_debugfs_get_dump_start(map, from, *ppos, &p);