Skip to content

Commit

Permalink
ipmi: Remove the now unused priority from SMI sender
Browse files Browse the repository at this point in the history
Since the queue was moved into the message handler, the priority
field is now irrelevant.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
  • Loading branch information
Corey Minyard committed Dec 11, 2014
1 parent b874b98 commit 99ab32f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
4 changes: 2 additions & 2 deletions drivers/char/ipmi/ipmi_msghandler.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down Expand Up @@ -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);
}
Expand Down
3 changes: 1 addition & 2 deletions drivers/char/ipmi/ipmi_si_intf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 4 additions & 5 deletions include/linux/ipmi_smi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down

0 comments on commit 99ab32f

Please sign in to comment.