ipmi: Remove smi->intf checks

Due to changes in the way shutdown is done, it is no longer
required to check that the interface is set.

Signed-off-by: Corey Minyard <cminyard@mvista.com>

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 2222caf4bab7f89ac24b33ef41e5072e67039f76..de4cfbc7ee0df41c3237a6899f6fc796c9520c61 100644 (file)
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -287,10 +287,7 @@ static void deliver_recv_msg(struct smi_info *smi_info,
                             struct ipmi_smi_msg *msg)
 {
        /* Deliver the message to the upper layer. */
-       if (smi_info->intf)
-               ipmi_smi_msg_received(smi_info->intf, msg);
-       else
-               ipmi_free_smi_msg(msg);
+       ipmi_smi_msg_received(smi_info->intf, msg);
 }
 
 static void return_hosed_msg(struct smi_info *smi_info, int cCode)
@@ -471,8 +468,7 @@ retry:
 
                start_clear_flags(smi_info);
                smi_info->msg_flags &= ~WDT_PRE_TIMEOUT_INT;
-               if (smi_info->intf)
-                       ipmi_smi_watchdog_pretimeout(smi_info->intf);
+               ipmi_smi_watchdog_pretimeout(smi_info->intf);
        } else if (smi_info->msg_flags & RECEIVE_MSG_AVAIL) {
                /* Messages available. */
                smi_info->curr_msg = alloc_msg_handle_irq(smi_info);
@@ -798,8 +794,7 @@ restart:
         * We prefer handling attn over new messages.  But don't do
         * this if there is not yet an upper layer to handle anything.
         */
-       if (likely(smi_info->intf) &&
-           (si_sm_result == SI_SM_ATTN || smi_info->got_attn)) {
+       if (si_sm_result == SI_SM_ATTN || smi_info->got_attn) {
                unsigned char msg[2];
 
                if (smi_info->si_state != SI_NORMAL) {

diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index 4cbaa5ebf8975c62aaa24e439631e79167267af6..ecabfe27c8288af0aaa6249bf95d0c58db89540e 100644 (file)
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -312,17 +312,13 @@ static void ipmi_ssif_unlock_cond(struct ssif_info *ssif_info,
 static void deliver_recv_msg(struct ssif_info *ssif_info,
                             struct ipmi_smi_msg *msg)
 {
-       struct ipmi_smi *intf = ssif_info->intf;
-
-       if (!intf) {
-               ipmi_free_smi_msg(msg);
-       } else if (msg->rsp_size < 0) {
+       if (msg->rsp_size < 0) {
                return_hosed_msg(ssif_info, msg);
                pr_err(PFX
                       "Malformed message in deliver_recv_msg: rsp_size = %d\n",
                       msg->rsp_size);
        } else {
-               ipmi_smi_msg_received(intf, msg);
+               ipmi_smi_msg_received(ssif_info->intf, msg);
        }
 }
 
@@ -449,12 +445,10 @@ static void start_recv_msg_fetch(struct ssif_info *ssif_info,
 static void handle_flags(struct ssif_info *ssif_info, unsigned long *flags)
 {
        if (ssif_info->msg_flags & WDT_PRE_TIMEOUT_INT) {
-               struct ipmi_smi *intf = ssif_info->intf;
                /* Watchdog pre-timeout */
                ssif_inc_stat(ssif_info, watchdog_pretimeouts);
                start_clear_flags(ssif_info, flags);
-               if (intf)
-                       ipmi_smi_watchdog_pretimeout(intf);
+               ipmi_smi_watchdog_pretimeout(ssif_info->intf);
        } else if (ssif_info->msg_flags & RECEIVE_MSG_AVAIL)
                /* Messages available. */
                start_recv_msg_fetch(ssif_info, flags);