Commit 305923bd authored by Corey Minyard's avatar Corey Minyard
Browse files

ipmi:msghandler: Rename recv_work to smi_work 



It handles both receive and transmit functions, make the name generic.

Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
parent 8de2640e

drivers/char/ipmi/ipmi_msghandler.c

+10 −10
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 


static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void);

static int ipmi_init_msghandler(void);

static void smi_recv_work(struct work_struct *t);

static void smi_work(struct work_struct *t);

static void handle_new_recv_msgs(struct ipmi_smi *intf);

static void need_waiter(struct ipmi_smi *intf);

static int handle_one_recv_msg(struct ipmi_smi *intf,
@@ -504,7 +504,7 @@ struct ipmi_smi { 
	spinlock_t       waiting_rcv_msgs_lock;

	struct list_head waiting_rcv_msgs;

	atomic_t	 watchdog_pretimeouts_to_deliver;

	struct work_struct recv_work;

	struct work_struct smi_work;



	spinlock_t             xmit_msgs_lock;

	struct list_head       xmit_msgs;
@@ -704,7 +704,7 @@ static void clean_up_interface_data(struct ipmi_smi *intf) 
	struct cmd_rcvr  *rcvr, *rcvr2;

	struct list_head list;



	cancel_work_sync(&intf->recv_work);

	cancel_work_sync(&intf->smi_work);



	free_smi_msg_list(&intf->waiting_rcv_msgs);

	free_recv_msg_list(&intf->waiting_events);
@@ -3602,7 +3602,7 @@ int ipmi_add_smi(struct module *owner, 
	intf->curr_seq = 0;

	spin_lock_init(&intf->waiting_rcv_msgs_lock);

	INIT_LIST_HEAD(&intf->waiting_rcv_msgs);

	INIT_WORK(&intf->recv_work, smi_recv_work);

	INIT_WORK(&intf->smi_work, smi_work);

	atomic_set(&intf->watchdog_pretimeouts_to_deliver, 0);

	spin_lock_init(&intf->xmit_msgs_lock);

	INIT_LIST_HEAD(&intf->xmit_msgs);
@@ -4808,10 +4808,10 @@ static void handle_new_recv_msgs(struct ipmi_smi *intf) 
	}

}



static void smi_recv_work(struct work_struct *t)

static void smi_work(struct work_struct *t)

{

	unsigned long flags = 0; /* keep us warning-free. */

	struct ipmi_smi *intf = from_work(intf, t, recv_work);

	struct ipmi_smi *intf = from_work(intf, t, smi_work);

	int run_to_completion = READ_ONCE(intf->run_to_completion);

	struct ipmi_smi_msg *newmsg = NULL;
@@ -4883,9 +4883,9 @@ void ipmi_smi_msg_received(struct ipmi_smi *intf, 
		spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);



	if (run_to_completion)

		smi_recv_work(&intf->recv_work);

		smi_work(&intf->smi_work);

	else

		queue_work(system_bh_wq, &intf->recv_work);

		queue_work(system_bh_wq, &intf->smi_work);

}

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



	atomic_set(&intf->watchdog_pretimeouts_to_deliver, 1);

	queue_work(system_bh_wq, &intf->recv_work);

	queue_work(system_bh_wq, &intf->smi_work);

}

EXPORT_SYMBOL(ipmi_smi_watchdog_pretimeout);
@@ -5064,7 +5064,7 @@ static bool ipmi_timeout_handler(struct ipmi_smi *intf, 
				       flags);

	}



	queue_work(system_bh_wq, &intf->recv_work);

	queue_work(system_bh_wq, &intf->smi_work);



	return need_timer;

}