Skip to content

Commit 305923b

Browse files
committed
ipmi:msghandler: Rename recv_work to smi_work
It handles both receive and transmit functions, make the name generic. Signed-off-by: Corey Minyard <cminyard@mvista.com>
1 parent 8de2640 commit 305923b

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

drivers/char/ipmi/ipmi_msghandler.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void);
4343
static int ipmi_init_msghandler(void);
44-
static void smi_recv_work(struct work_struct *t);
44+
static void smi_work(struct work_struct *t);
4545
static void handle_new_recv_msgs(struct ipmi_smi *intf);
4646
static void need_waiter(struct ipmi_smi *intf);
4747
static int handle_one_recv_msg(struct ipmi_smi *intf,
@@ -504,7 +504,7 @@ struct ipmi_smi {
504504
spinlock_t waiting_rcv_msgs_lock;
505505
struct list_head waiting_rcv_msgs;
506506
atomic_t watchdog_pretimeouts_to_deliver;
507-
struct work_struct recv_work;
507+
struct work_struct smi_work;
508508

509509
spinlock_t xmit_msgs_lock;
510510
struct list_head xmit_msgs;
@@ -704,7 +704,7 @@ static void clean_up_interface_data(struct ipmi_smi *intf)
704704
struct cmd_rcvr *rcvr, *rcvr2;
705705
struct list_head list;
706706

707-
cancel_work_sync(&intf->recv_work);
707+
cancel_work_sync(&intf->smi_work);
708708

709709
free_smi_msg_list(&intf->waiting_rcv_msgs);
710710
free_recv_msg_list(&intf->waiting_events);
@@ -3602,7 +3602,7 @@ int ipmi_add_smi(struct module *owner,
36023602
intf->curr_seq = 0;
36033603
spin_lock_init(&intf->waiting_rcv_msgs_lock);
36043604
INIT_LIST_HEAD(&intf->waiting_rcv_msgs);
3605-
INIT_WORK(&intf->recv_work, smi_recv_work);
3605+
INIT_WORK(&intf->smi_work, smi_work);
36063606
atomic_set(&intf->watchdog_pretimeouts_to_deliver, 0);
36073607
spin_lock_init(&intf->xmit_msgs_lock);
36083608
INIT_LIST_HEAD(&intf->xmit_msgs);
@@ -4808,10 +4808,10 @@ static void handle_new_recv_msgs(struct ipmi_smi *intf)
48084808
}
48094809
}
48104810

4811-
static void smi_recv_work(struct work_struct *t)
4811+
static void smi_work(struct work_struct *t)
48124812
{
48134813
unsigned long flags = 0; /* keep us warning-free. */
4814-
struct ipmi_smi *intf = from_work(intf, t, recv_work);
4814+
struct ipmi_smi *intf = from_work(intf, t, smi_work);
48154815
int run_to_completion = READ_ONCE(intf->run_to_completion);
48164816
struct ipmi_smi_msg *newmsg = NULL;
48174817

@@ -4883,9 +4883,9 @@ void ipmi_smi_msg_received(struct ipmi_smi *intf,
48834883
spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);
48844884

48854885
if (run_to_completion)
4886-
smi_recv_work(&intf->recv_work);
4886+
smi_work(&intf->smi_work);
48874887
else
4888-
queue_work(system_bh_wq, &intf->recv_work);
4888+
queue_work(system_bh_wq, &intf->smi_work);
48894889
}
48904890
EXPORT_SYMBOL(ipmi_smi_msg_received);
48914891

@@ -4895,7 +4895,7 @@ void ipmi_smi_watchdog_pretimeout(struct ipmi_smi *intf)
48954895
return;
48964896

48974897
atomic_set(&intf->watchdog_pretimeouts_to_deliver, 1);
4898-
queue_work(system_bh_wq, &intf->recv_work);
4898+
queue_work(system_bh_wq, &intf->smi_work);
48994899
}
49004900
EXPORT_SYMBOL(ipmi_smi_watchdog_pretimeout);
49014901

@@ -5064,7 +5064,7 @@ static bool ipmi_timeout_handler(struct ipmi_smi *intf,
50645064
flags);
50655065
}
50665066

5067-
queue_work(system_bh_wq, &intf->recv_work);
5067+
queue_work(system_bh_wq, &intf->smi_work);
50685068

50695069
return need_timer;
50705070
}

0 commit comments

Comments
 (0)