On 22/9/23 17:59, Cédric Le Goater wrote:
commit 8137355e850f ("aspeed/timer: Fix behaviour running Linux")
introduced a MAX() expression to calculate the next timer deadline :

     return calculate_time(t, MAX(MAX(t->match[0], t->match[1]), 0));

The second MAX() is not necessary since the compared values are an
unsigned and 0. Simply remove it and fix warning :

   ../hw/timer/aspeed_timer.c: In function ‘calculate_next’:
   ../include/qemu/osdep.h:396:31: warning: declaration of ‘_a’ shadows a 
previous local [-Wshadow=compatible-local]
     396 |         typeof(1 ? (a) : (b)) _a = (a), _b = (b);       \
         |                               ^~
   ../hw/timer/aspeed_timer.c:170:12: note: in expansion of macro ‘MAX’
     170 |     next = MAX(MAX(calculate_match(t, 0), calculate_match(t, 1)), 0);
         |            ^~~
   ../hw/timer/aspeed_timer.c:170:16: note: in expansion of macro ‘MAX’
     170 |     next = MAX(MAX(calculate_match(t, 0), calculate_match(t, 1)), 0);
         |                ^~~
   /home/legoater/work/qemu/qemu-aspeed.git/include/qemu/osdep.h:396:31: note: 
shadowed declaration is here
     396 |         typeof(1 ? (a) : (b)) _a = (a), _b = (b);       \
         |                               ^~
   ../hw/timer/aspeed_timer.c:170:12: note: in expansion of macro ‘MAX’
     170 |     next = MAX(MAX(calculate_match(t, 0), calculate_match(t, 1)), 0);
         |            ^~~

Cc: Joel Stanley <j...@jms.id.au>
Cc: Andrew Jeffery <and...@aj.id.au>
Signed-off-by: Cédric Le Goater <c...@kaod.org>
---
  hw/timer/aspeed_timer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>


Reply via email to