瀏覽代碼

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>
Corey Minyard 11 年之前
父節點
當前提交
99ab32f3b5
共有 3 個文件被更改,包括 7 次插入9 次删除
  1. 2 2
      drivers/char/ipmi/ipmi_msghandler.c
  2. 1 2
      drivers/char/ipmi/ipmi_si_intf.c
  3. 4 5
      include/linux/ipmi_smi.h

+ 2 - 2
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);
 		spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);
 
 
 	if (smi_msg)
 	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)
 	if (!run_to_completion)
 		spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);
 		spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);
 	if (newmsg)
 	if (newmsg)
-		intf->handlers->sender(intf->send_info, newmsg, 0);
+		intf->handlers->sender(intf->send_info, newmsg);
 
 
 	handle_new_recv_msgs(intf);
 	handle_new_recv_msgs(intf);
 }
 }

+ 1 - 2
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,
 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;
 	struct smi_info   *smi_info = send_info;
 	enum si_sm_result result;
 	enum si_sm_result result;

+ 4 - 5
include/linux/ipmi_smi.h

@@ -98,12 +98,11 @@ struct ipmi_smi_handlers {
 	   operation is not allowed to fail.  If an error occurs, it
 	   operation is not allowed to fail.  If an error occurs, it
 	   should report back the error in a received message.  It may
 	   should report back the error in a received message.  It may
 	   do this in the current call context, since no write locks
 	   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,
 	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
 	/* Called by the upper layer to request that we try to get
 	   events from the BMC we are attached to. */
 	   events from the BMC we are attached to. */