diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2016-10-28 11:38:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-10-28 18:19:24 +0100 |
| commit | 72193a953ada9058e46970838cc42cbd18bf4eba (patch) | |
| tree | 5c3beb6980a8edf27d1311d5537f23df2475ffb8 /include/linux | |
| parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
| download | lwn-72193a953ada9058e46970838cc42cbd18bf4eba.tar.gz lwn-72193a953ada9058e46970838cc42cbd18bf4eba.zip | |
regmap: Rename ret variable in regmap_read_poll_timeout
As almost all of the callers of the regmap_read_poll_timeout macro
will include a local ret variable we will always get a Sparse warning
about the duplication of the ret variable:
warning: symbol 'ret' shadows an earlier one
Simply rename the ret variable in the marco to pollret to make this
significantly less likely to happen.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regmap.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 9adc7b21903d..fc9e3c576f9c 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -116,22 +116,22 @@ struct reg_sequence { #define regmap_read_poll_timeout(map, addr, val, cond, sleep_us, timeout_us) \ ({ \ ktime_t timeout = ktime_add_us(ktime_get(), timeout_us); \ - int ret; \ + int pollret; \ might_sleep_if(sleep_us); \ for (;;) { \ - ret = regmap_read((map), (addr), &(val)); \ - if (ret) \ + pollret = regmap_read((map), (addr), &(val)); \ + if (pollret) \ break; \ if (cond) \ break; \ if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \ - ret = regmap_read((map), (addr), &(val)); \ + pollret = regmap_read((map), (addr), &(val)); \ break; \ } \ if (sleep_us) \ usleep_range((sleep_us >> 2) + 1, sleep_us); \ } \ - ret ?: ((cond) ? 0 : -ETIMEDOUT); \ + pollret ?: ((cond) ? 0 : -ETIMEDOUT); \ }) #ifdef CONFIG_REGMAP |