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

Commit a3471469 authored by Russell King's avatar Russell King Committed by Mark Brown
Browse files

regmap: regmap: avoid spurious warning in regmap_read_debugfs 



Gcc warns about the case where regmap_read_debugfs tries to walk an
empty map->debugfs_off_cache list, which would results in uninitialized
variable getting returned, if we hadn't checked the same condition
just before that.

After an originally suggested inferior patch from Arnd Bergmann,
this is the solution that Russell King came up with, sidestepping
the problem by merging the error case for an empty list with the
normal path.

Without this patch, building mxs_defconfig results in:

drivers/base/regmap/regmap-debugfs.c: In function 'regmap_read_debugfs':
drivers/base/regmap/regmap-debugfs.c:147:9: : warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized]

Reported-by: default avatarVincent Stehle <v-stehle@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 949db153

drivers/base/regmap/regmap-debugfs.c

+2 −4
Original line number Diff line number Diff line
@@ -128,10 +128,8 @@ static unsigned int regmap_debugfs_get_dump_start(struct regmap *map, 
	 * allocate and we should never be in this code if there are

	 * no registers at all.

	 */

	if (list_empty(&map->debugfs_off_cache)) {

	WARN_ON(list_empty(&map->debugfs_off_cache));

		return base;

	}

	ret = base;



	/* Find the relevant block */

	list_for_each_entry(c, &map->debugfs_off_cache, list) {