Applied "regmap: debugfs: Remove scratch buffer for register length calculation" to the regmap tree
Subsystems (2)
Mark Brown
maintainerThe patch
regmap: debugfs: Remove scratch buffer for register length calculation
has been applied to the regmap tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
9ae3109d1d9ff367e0d0efa7073cc078edb9a372Mon Sep 17 00:00:00 2001
From: Mark Brown <[email protected]>
Date: Sat, 19 Sep 2015 07:31:47 -0700
Subject: [PATCH] regmap: debugfs: Remove scratch buffer for register length
calculation
Now we no longer use the scratch buffer for register length calculation there is no need for callers to supply one.
--- drivers/base/regmap/regmap-debugfs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/base/regmap/regmap-debugfs.c +3 -4
@@ -30,7 +30,7 @@ static LIST_HEAD(regmap_debugfs_early_list);static DEFINE_MUTEX (regmap_debugfs_early_lock);/* Calculate the length of a fixed format */ -static size_t regmap_calc_reg_len (int max_val,char *buf,size_t buf_size) +static size_t regmap_calc_reg_len (int max_val) {return snprintf (NULL ,0 ,"%x" , max_val); }
@@ -173,8 +173,7 @@ static inline void regmap_calc_tot_len(struct regmap *map, {/* 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_reg_len =regmap_calc_reg_len (map->max_register), map->debugfs_val_len =2 * map->format.val_bytes; map->debugfs_tot_len = map->debugfs_reg_len + map->debugfs_val_len +3 ;/* : \n */
@@ -420,7 +419,7 @@ static ssize_t regmap_access_read_file(struct file *file,return -ENOMEM ;/* Calculate the length of a fixed format */ - reg_len =regmap_calc_reg_len (map->max_register, buf, count); + reg_len =regmap_calc_reg_len (map->max_register); tot_len = reg_len +10 ;/* ': R W V P\n' */ for (i =0 ; i <= map->max_register; i += map->reg_stride) {
Signature · 1 line
2.5.0