We currently evaluate timeout_us three times, which is unexpected and suboptimal when having complexer timeout calculations.
Define a local variable to fix this. Signed-off-by: Ahmad Fatoum <a.fat...@pengutronix.de> --- include/linux/iopoll.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h index c38190272606..a6fade2a11fc 100644 --- a/include/linux/iopoll.h +++ b/include/linux/iopoll.h @@ -20,7 +20,7 @@ # define read_poll_get_time_ns() 0 # endif # ifndef read_poll_is_timeout -# define read_poll_is_timeout(s, t) ((void)s, (void)t, 0) +# define read_poll_is_timeout(s, t) ((void)(s), (void)(t), 0) # endif #endif @@ -43,13 +43,14 @@ */ #define read_poll_timeout(op, val, cond, timeout_us, args...) \ ({ \ - uint64_t start = (timeout_us) != 0 ? read_poll_get_time_ns() : 0; \ + uint64_t __timeout_us = (timeout_us); \ + uint64_t start = __timeout_us ? read_poll_get_time_ns() : 0; \ for (;;) { \ (val) = op(args); \ if (cond) \ break; \ - if ((timeout_us) != 0 && \ - read_poll_is_timeout(start, ((timeout_us) * USECOND))) { \ + if (__timeout_us && \ + read_poll_is_timeout(start, __timeout_us * USECOND)) { \ (val) = op(args); \ break; \ } \ -- 2.39.5