Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+5
-9
+5
-9
drivers/char/ipmi/ipmi_si_intf.c
+5
-9
drivers/char/ipmi/ipmi_si_intf.c
···
1096
1096
/* Running with interrupts, only do long timeouts. */
1097
1097
timeout = jiffies + SI_TIMEOUT_JIFFIES;
1098
1098
smi_inc_stat(smi_info, long_timeouts);
1099
-
goto do_mod_timer;
1100
-
}
1101
-
1102
-
/*
1103
-
* If the state machine asks for a short delay, then shorten
1104
-
* the timer timeout.
1105
-
*/
1106
-
if (smi_result == SI_SM_CALL_WITH_DELAY) {
1099
+
} else if (smi_result == SI_SM_CALL_WITH_DELAY) {
1100
+
/*
1101
+
* If the state machine asks for a short delay, then shorten
1102
+
* the timer timeout.
1103
+
*/
1107
1104
smi_inc_stat(smi_info, short_timeouts);
1108
1105
timeout = jiffies + 1;
1109
1106
} else {
···
1108
1111
timeout = jiffies + SI_TIMEOUT_JIFFIES;
1109
1112
}
1110
1113
1111
-
do_mod_timer:
1112
1114
if (smi_result != SI_SM_IDLE)
1113
1115
smi_mod_timer(smi_info, timeout);
1114
1116
else