[PATCH] regmap: silence GCC warning

From: Paul Bolle
Date: Sun Sep 30 2012 - 06:16:47 EST


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@xxxxxxxxxx>
---
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/