leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regmap: fix regmap_read_poll_timeout warning about sandbox_timer_add_offset

Browse Source 
When fixing sandbox test for regmap_read_poll_timeout(), the
sandbox_timer_add_offset was introduced but only defined in sandbox code
thus generating warnings when used out of sandbox :

include/regmap.h:289:2: note: in expansion of macro 'regmap_read_poll_timeout_test'
regmap_read_poll_timeout_test(map, addr, val, cond, sleep_us, \
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/spi/meson_spifc.c:169:8: note: in expansion of macro 'regmap_read_poll_timeout'
ret = regmap_read_poll_timeout(spifc->regmap, REG_SLAVE, data,
        ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/spi/meson_spifc.c: In function 'meson_spifc_txrx':
include/regmap.h:277:4: warning: implicit declaration of function 'sandbox_timer_add_offset' [-Wimplicit-function-declaration]

This fix adds a timer_test_add_offset() only defined in sandbox, and
renames the previous sandbox_timer_add_offset() to it.

Cc: Simon Glass <sjg@chromium.org>
Reported-by: Tom Rini <trini@konsulko.com>
Fixes: df9cf1cc08 ("test: dm: regmap: Fix the long test delay")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Neil Armstrong 2019-04-11 17:01:23 +02:00
parent 2c4e3cf212
commit d0a9b82b75
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/sandbox/include/asm/test.h
View File

@ -59,14 +59,6 @@ void sandbox_i2c_eeprom_set_test_mode(struct udevice *dev,
void sandbox_i2c_eeprom_set_offset_len(struct udevice *dev, int offset_len); void sandbox_i2c_eeprom_set_offset_len(struct udevice *dev, int offset_len);
/*
* sandbox_timer_add_offset()
*
* Allow tests to add to the time reported through lib/time.c functions
* offset: number of milliseconds to advance the system time
*/
void sandbox_timer_add_offset(unsigned long offset);
/** /**
* sandbox_i2c_rtc_set_offset() - set the time offset from system/base time * sandbox_i2c_rtc_set_offset() - set the time offset from system/base time
* *

2
board/sandbox/sandbox.c
View File

@ -31,7 +31,7 @@ void flush_cache(unsigned long start, unsigned long size)
/* system timer offset in ms */ /* system timer offset in ms */
static unsigned long sandbox_timer_offset; static unsigned long sandbox_timer_offset;
void sandbox_timer_add_offset(unsigned long offset) void timer_test_add_offset(unsigned long offset)
{ {
sandbox_timer_offset += offset; sandbox_timer_offset += offset;
} }

2
drivers/net/sandbox.c
View File

@ -350,7 +350,7 @@ static int sb_eth_recv(struct udevice *dev, int flags, uchar **packetp)
struct eth_sandbox_priv *priv = dev_get_priv(dev); struct eth_sandbox_priv *priv = dev_get_priv(dev);
if (skip_timeout) { if (skip_timeout) {
sandbox_timer_add_offset(11000UL); timer_test_add_offset(11000UL);
skip_timeout = false; skip_timeout = false;
} }

2
drivers/timer/sandbox_timer.c
View File

@ -14,7 +14,7 @@
/* system timer offset in ms */ /* system timer offset in ms */
static unsigned long sandbox_timer_offset; static unsigned long sandbox_timer_offset;
void sandbox_timer_add_offset(unsigned long offset) void timer_test_add_offset(unsigned long offset)
{ {
sandbox_timer_offset += offset; sandbox_timer_offset += offset;
} }

2
include/regmap.h
View File

@ -274,7 +274,7 @@ int regmap_raw_read_range(struct regmap *map, uint range_num, uint offset,
if (cond) \ if (cond) \
break; \ break; \
if (IS_ENABLED(CONFIG_SANDBOX) && test_add_time) \ if (IS_ENABLED(CONFIG_SANDBOX) && test_add_time) \
sandbox_timer_add_offset(test_add_time); \ timer_test_add_offset(test_add_time); \
if ((timeout_ms) && get_timer(__start) > (timeout_ms)) { \ if ((timeout_ms) && get_timer(__start) > (timeout_ms)) { \
__ret = regmap_read((map), (addr), &(val)); \ __ret = regmap_read((map), (addr), &(val)); \
break; \ break; \

8
include/time.h
View File

@ -13,6 +13,14 @@ unsigned long get_timer(unsigned long base);
*/ */
unsigned long timer_get_us(void); unsigned long timer_get_us(void);
/*
* timer_test_add_offset()
*
* Allow tests to add to the time reported through lib/time.c functions
* offset: number of milliseconds to advance the system time
*/
void timer_test_add_offset(unsigned long offset);
/* /*
* These inlines deal with timer wrapping correctly. You are * These inlines deal with timer wrapping correctly. You are
* strongly encouraged to use them * strongly encouraged to use them