superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipmi:si: Merge some if statements 

Changes resulted in a silly looking piece of logic.  Get rid of a goto
and use if statements properly.

Signed-off-by: Corey Minyard <corey@minyard.net>
pull/1354/merge
Corey Minyard 2025-08-20 13:11:55 -05:00
parent bbfb8353cb
commit 753bc23d8f
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/char/ipmi/ipmi_si_intf.c
View File

@ -1096,14 +1096,11 @@ static void smi_timeout(struct timer_list *t)
/* Running with interrupts, only do long timeouts. */
timeout = jiffies + SI_TIMEOUT_JIFFIES;
smi_inc_stat(smi_info, long_timeouts);
goto do_mod_timer;
}
/*
* If the state machine asks for a short delay, then shorten
* the timer timeout.
*/
if (smi_result == SI_SM_CALL_WITH_DELAY) {
} else if (smi_result == SI_SM_CALL_WITH_DELAY) {
/*
* If the state machine asks for a short delay, then shorten
* the timer timeout.
*/
smi_inc_stat(smi_info, short_timeouts);
timeout = jiffies + 1;
} else {
@ -1111,7 +1108,6 @@ static void smi_timeout(struct timer_list *t)
timeout = jiffies + SI_TIMEOUT_JIFFIES;
}
do_mod_timer:
if (smi_result != SI_SM_IDLE)
smi_mod_timer(smi_info, timeout);
else