ipmi: Remove the now unused priority from SMI sender

Since the queue was moved into the message handler, the priority
field is now irrelevant.

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

diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index b705218fbbfa1b51f0da710badd18c0eef5d80b7..5fa83f751378fb56ecc7da11a16d2c8386fb6862 100644 (file)
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -1516,7 +1516,7 @@ static void smi_send(ipmi_smi_t intf, struct ipmi_smi_handlers *handlers,
                spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);
 
        if (smi_msg)
-               handlers->sender(intf->send_info, smi_msg, 0);
+               handlers->sender(intf->send_info, smi_msg);
 }
 
 /*
@@ -3908,7 +3908,7 @@ static void smi_recv_tasklet(unsigned long val)
        if (!run_to_completion)
                spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);
        if (newmsg)
-               intf->handlers->sender(intf->send_info, newmsg, 0);
+               intf->handlers->sender(intf->send_info, newmsg);
 
        handle_new_recv_msgs(intf);
 }

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index d31a7fce2260189afbefef2750717d5814e3fb70..4f11301a0c4283ec1a693514d9ff9375d233a168 100644 (file)
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -892,8 +892,7 @@ static void check_start_timer_thread(struct smi_info *smi_info)
 }
 
 static void sender(void                *send_info,
-                  struct ipmi_smi_msg *msg,
-                  int                 priority)
+                  struct ipmi_smi_msg *msg)
 {
        struct smi_info   *smi_info = send_info;
        enum si_sm_result result;

diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h
index 6131845016d95e1a910ef2637362a9b1d2d580e9..0b1e569f5ff5e630a5766321a422fc365470a5f0 100644 (file)
--- a/include/linux/ipmi_smi.h
+++ b/include/linux/ipmi_smi.h
@@ -98,12 +98,11 @@ struct ipmi_smi_handlers {
           operation is not allowed to fail.  If an error occurs, it
           should report back the error in a received message.  It may
           do this in the current call context, since no write locks
-          are held when this is run.  If the priority is > 0, the
-          message will go into a high-priority queue and be sent
-          first.  Otherwise, it goes into a normal-priority queue. */
+          are held when this is run.  Message are delivered one at
+          a time by the message handler, a new message will not be
+          delivered until the previous message is returned. */
        void (*sender)(void                *send_info,
-                      struct ipmi_smi_msg *msg,
-                      int                 priority);
+                      struct ipmi_smi_msg *msg);
 
        /* Called by the upper layer to request that we try to get
           events from the BMC we are attached to. */