aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Minyard <cminyard@mvista.com>2016-04-26 23:40:15 -0400
committerCorey Minyard <cminyard@mvista.com>2016-05-16 20:49:48 -0400
commit76824852a941375aad640b35025dac75d077113a (patch)
tree07785a6b863e5e0bf9e03b5ff5341b63ea1bd5cd
parent2dcd0af568b0cf583645c8a317dd12e344b1c72a (diff)
ipmi: Fix some minor coding style issues
Signed-off-by: Corey Minyard <cminyard@mvista.com>
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 1e25b5205724..8d984f9ec5d7 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -104,7 +104,7 @@ enum si_intf_state {
104#define IPMI_BT_INTMASK_ENABLE_IRQ_BIT 1 104#define IPMI_BT_INTMASK_ENABLE_IRQ_BIT 1
105 105
106enum si_type { 106enum si_type {
107 SI_KCS, SI_SMIC, SI_BT 107 SI_KCS, SI_SMIC, SI_BT
108}; 108};
109 109
110static const char * const si_to_str[] = { "kcs", "smic", "bt" }; 110static const char * const si_to_str[] = { "kcs", "smic", "bt" };
@@ -410,7 +410,7 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info)
410 410
411 rv = SI_SM_CALL_WITHOUT_DELAY; 411 rv = SI_SM_CALL_WITHOUT_DELAY;
412 } 412 }
413 out: 413out:
414 return rv; 414 return rv;
415} 415}
416 416
@@ -539,7 +539,7 @@ static struct ipmi_smi_msg *alloc_msg_handle_irq(struct smi_info *smi_info)
539 539
540static void handle_flags(struct smi_info *smi_info) 540static void handle_flags(struct smi_info *smi_info)
541{ 541{
542 retry: 542retry:
543 if (smi_info->msg_flags & WDT_PRE_TIMEOUT_INT) { 543 if (smi_info->msg_flags & WDT_PRE_TIMEOUT_INT) {
544 /* Watchdog pre-timeout */ 544 /* Watchdog pre-timeout */
545 smi_inc_stat(smi_info, watchdog_pretimeouts); 545 smi_inc_stat(smi_info, watchdog_pretimeouts);
@@ -831,7 +831,7 @@ static enum si_sm_result smi_event_handler(struct smi_info *smi_info,
831{ 831{
832 enum si_sm_result si_sm_result; 832 enum si_sm_result si_sm_result;
833 833
834 restart: 834restart:
835 /* 835 /*
836 * There used to be a loop here that waited a little while 836 * There used to be a loop here that waited a little while
837 * (around 25us) before giving up. That turned out to be 837 * (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,
944 smi_info->timer_running = false; 944 smi_info->timer_running = false;
945 } 945 }
946 946
947 out: 947out:
948 return si_sm_result; 948 return si_sm_result;
949} 949}
950 950
@@ -1190,7 +1190,7 @@ static void smi_timeout(unsigned long data)
1190 timeout = jiffies + SI_TIMEOUT_JIFFIES; 1190 timeout = jiffies + SI_TIMEOUT_JIFFIES;
1191 } 1191 }
1192 1192
1193 do_mod_timer: 1193do_mod_timer:
1194 if (smi_result != SI_SM_IDLE) 1194 if (smi_result != SI_SM_IDLE)
1195 smi_mod_timer(smi_info, timeout); 1195 smi_mod_timer(smi_info, timeout);
1196 else 1196 else
@@ -1576,10 +1576,9 @@ static int port_setup(struct smi_info *info)
1576 if (request_region(addr + idx * info->io.regspacing, 1576 if (request_region(addr + idx * info->io.regspacing,
1577 info->io.regsize, DEVICE_NAME) == NULL) { 1577 info->io.regsize, DEVICE_NAME) == NULL) {
1578 /* Undo allocations */ 1578 /* Undo allocations */
1579 while (idx--) { 1579 while (idx--)
1580 release_region(addr + idx * info->io.regspacing, 1580 release_region(addr + idx * info->io.regspacing,
1581 info->io.regsize); 1581 info->io.regsize);
1582 }
1583 return -EIO; 1582 return -EIO;
1584 } 1583 }
1585 } 1584 }
@@ -1975,7 +1974,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
1975 } 1974 }
1976 } 1975 }
1977 rv = len; 1976 rv = len;
1978 out: 1977out:
1979 kfree(str); 1978 kfree(str);
1980 return rv; 1979 return rv;
1981} 1980}
@@ -2945,7 +2944,7 @@ static int try_get_dev_id(struct smi_info *smi_info)
2945 /* Check and record info from the get device id, in case we need it. */ 2944 /* Check and record info from the get device id, in case we need it. */
2946 rv = ipmi_demangle_device_id(resp, resp_len, &smi_info->device_id); 2945 rv = ipmi_demangle_device_id(resp, resp_len, &smi_info->device_id);
2947 2946
2948 out: 2947out:
2949 kfree(resp); 2948 kfree(resp);
2950 return rv; 2949 return rv;
2951} 2950}
@@ -3192,7 +3191,7 @@ static int try_enable_event_buffer(struct smi_info *smi_info)
3192 else 3191 else
3193 smi_info->supports_event_msg_buff = true; 3192 smi_info->supports_event_msg_buff = true;
3194 3193
3195 out: 3194out:
3196 kfree(resp); 3195 kfree(resp);
3197 return rv; 3196 return rv;
3198} 3197}
@@ -3718,10 +3717,10 @@ static int try_smi_init(struct smi_info *new_smi)
3718 3717
3719 return 0; 3718 return 0;
3720 3719
3721 out_err_stop_timer: 3720out_err_stop_timer:
3722 wait_for_timer_and_thread(new_smi); 3721 wait_for_timer_and_thread(new_smi);
3723 3722
3724 out_err: 3723out_err:
3725 new_smi->interrupt_disabled = true; 3724 new_smi->interrupt_disabled = true;
3726 3725
3727 if (new_smi->intf) { 3726 if (new_smi->intf) {