[PATCH] regmap: silence GCC warning

* [PATCH] regmap: silence GCC warning
@ 2012-09-30 10:15 Paul Bolle
  2012-10-01 10:03 ` Mark Brown
  0 siblings, 1 reply; 17+ messages in thread
From: Paul Bolle @ 2012-09-30 10:15 UTC (permalink / raw)
  To: Mark Brown, Greg Kroah-Hartman; +Cc: linux-kernel

Building regmap.o triggers this GCC warning:
    drivers/base/regmap/regmap.c: In function ‘regmap_raw_read’:
    drivers/base/regmap/regmap.c:1172:6: warning: ‘ret’ may be used uninitialized in this function [-Wmaybe-uninitialized]

It seems 'ret' should always be set when this function returns. See, the
else-branch can leave 'ret' uninitialized only if 'val_count' is zero.
But if 'val_count' is zero regmap_volatile_range() will return true.
That implies that 'ret' will be set in the if-branch. ('val_count' could
be zero if 'val_len' is, for example, zero. That would be useless input,
however.)

Anyhow, initializing 'ret' to -EINVAL silences GCC and is harmless.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
I noticed this warning while building v3.6-rc7 on current Fedora 17,
using Fedora's default config.

 drivers/base/regmap/regmap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index c241ae2..025f41c 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1169,12 +1169,12 @@ int regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
 	size_t val_bytes = map->format.val_bytes;
 	size_t val_count = val_len / val_bytes;
 	unsigned int v;
-	int ret, i;
+	int i, ret = -EINVAL;
 
 	if (val_len % map->format.val_bytes)
-		return -EINVAL;
+		return ret;
 	if (reg % map->reg_stride)
-		return -EINVAL;
+		return ret;
 
 	map->lock(map);
 
-- 
1.7.11.4


^ permalink raw reply related	[flat|nested] 17+ messages in thread