Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dd7c553 authored by Dimitris Papastamos's avatar Dimitris Papastamos Committed by Mark Brown
Browse files

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: default avatarDimitris Papastamos <dp@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent cf57d607

drivers/base/regmap/regmap-debugfs.c

+14 −8
Original line number Diff line number Diff line
@@ -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);