From dc11ffb562e1227344ae33af5ccad86eab57ba35 Mon Sep 17 00:00:00 2001 From: Jennifer Williams Date: Sat, 20 Mar 2021 00:36:55 +0200 Subject: [PATCH] kernel: timeout: fix missing final else z_timeout_end_calc() was missing final else statement in the if else if construct. This commit pulls the last condition into a final else {} to comply with guideline 15.7. Signed-off-by: Jennifer Williams --- kernel/timeout.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel/timeout.c b/kernel/timeout.c index fa5afb00d8f..54fce1c0679 100644 --- a/kernel/timeout.c +++ b/kernel/timeout.c @@ -310,12 +310,13 @@ uint64_t sys_clock_timeout_end_calc(k_timeout_t timeout) return UINT64_MAX; } else if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) { return sys_clock_tick_get(); - } + } else { - dt = timeout.ticks; + dt = timeout.ticks; - if (IS_ENABLED(CONFIG_TIMEOUT_64BIT) && Z_TICK_ABS(dt) >= 0) { - return Z_TICK_ABS(dt); + if (IS_ENABLED(CONFIG_TIMEOUT_64BIT) && Z_TICK_ABS(dt) >= 0) { + return Z_TICK_ABS(dt); + } + return sys_clock_tick_get() + MAX(1, dt); } - return sys_clock_tick_get() + MAX(1, dt); }