regmap: Rename ret variable in regmap_read_poll_timeout (72193a95) · Commits · 戴 / test

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>

include/linux/regmap.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -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

Admin message