xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipmi: Fix some minor coding style issues

Browse Source 
Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
Corey Minyard
2016-04-26 22:40:15 -05:00
parent 2dcd0af568
commit 76824852a9
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -410,7 +410,7 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info)
rv = SI_SM_CALL_WITHOUT_DELAY; rv = SI_SM_CALL_WITHOUT_DELAY;
} }
out: out:
return rv; return rv;
} }
@@ -539,7 +539,7 @@ static struct ipmi_smi_msg *alloc_msg_handle_irq(struct smi_info *smi_info)
static void handle_flags(struct smi_info *smi_info) static void handle_flags(struct smi_info *smi_info)
{ {
retry: retry:
if (smi_info->msg_flags & WDT_PRE_TIMEOUT_INT) { if (smi_info->msg_flags & WDT_PRE_TIMEOUT_INT) {
/* Watchdog pre-timeout */ /* Watchdog pre-timeout */
smi_inc_stat(smi_info, watchdog_pretimeouts); smi_inc_stat(smi_info, watchdog_pretimeouts);
@@ -831,7 +831,7 @@ static enum si_sm_result smi_event_handler(struct smi_info *smi_info,
{ {
enum si_sm_result si_sm_result; enum si_sm_result si_sm_result;
restart: restart:
/* /*
* There used to be a loop here that waited a little while * There used to be a loop here that waited a little while
* (around 25us) before giving up. That turned out to be * (around 25us) before giving up. That turned out to be
@@ -944,7 +944,7 @@ static enum si_sm_result smi_event_handler(struct smi_info *smi_info,
smi_info->timer_running = false; smi_info->timer_running = false;
} }
out: out:
return si_sm_result; return si_sm_result;
} }
@@ -1190,7 +1190,7 @@ static void smi_timeout(unsigned long data)
timeout = jiffies + SI_TIMEOUT_JIFFIES; timeout = jiffies + SI_TIMEOUT_JIFFIES;
} }
do_mod_timer: do_mod_timer:
if (smi_result != SI_SM_IDLE) if (smi_result != SI_SM_IDLE)
smi_mod_timer(smi_info, timeout); smi_mod_timer(smi_info, timeout);
else else
@@ -1576,10 +1576,9 @@ static int port_setup(struct smi_info *info)
if (request_region(addr + idx * info->io.regspacing, if (request_region(addr + idx * info->io.regspacing,
info->io.regsize, DEVICE_NAME) == NULL) { info->io.regsize, DEVICE_NAME) == NULL) {
/* Undo allocations */ /* Undo allocations */
while (idx--) { while (idx--)
release_region(addr + idx * info->io.regspacing, release_region(addr + idx * info->io.regspacing,
info->io.regsize); info->io.regsize);
}
return -EIO; return -EIO;
} }
} }
@@ -1975,7 +1974,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
} }
} }
rv = len; rv = len;
out: out:
kfree(str); kfree(str);
return rv; return rv;
} }
@@ -2945,7 +2944,7 @@ static int try_get_dev_id(struct smi_info *smi_info)
/* Check and record info from the get device id, in case we need it. */ /* Check and record info from the get device id, in case we need it. */
rv = ipmi_demangle_device_id(resp, resp_len, &smi_info->device_id); rv = ipmi_demangle_device_id(resp, resp_len, &smi_info->device_id);
out: out:
kfree(resp); kfree(resp);
return rv; return rv;
} }
@@ -3192,7 +3191,7 @@ static int try_enable_event_buffer(struct smi_info *smi_info)
else else
smi_info->supports_event_msg_buff = true; smi_info->supports_event_msg_buff = true;
out: out:
kfree(resp); kfree(resp);
return rv; return rv;
} }
@@ -3718,10 +3717,10 @@ static int try_smi_init(struct smi_info *new_smi)
return 0; return 0;
out_err_stop_timer: out_err_stop_timer:
wait_for_timer_and_thread(new_smi); wait_for_timer_and_thread(new_smi);
out_err: out_err:
new_smi->interrupt_disabled = true; new_smi->interrupt_disabled = true;
if (new_smi->intf) { if (new_smi->intf) {