ipmi: Consolidate the run to completion checking for xmit msgs lock

It made things hard to read, move the check to a function.

Signed-off-by: Corey Minyard <corey@minyard.net>
Reviewed-by: Breno Leitao <leitao@debian.org>

diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index a590a67294e2488eaf0c8dbbef6f7842adcbed80..a042b1596933f9c19d93e83fc0819b43f466e36d 100644 (file)
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -602,6 +602,22 @@ static int __ipmi_bmc_register(struct ipmi_smi *intf,
 static int __scan_channels(struct ipmi_smi *intf,
                                struct ipmi_device_id *id, bool rescan);
 
+static void ipmi_lock_xmit_msgs(struct ipmi_smi *intf, int run_to_completion,
+                               unsigned long *flags)
+{
+       if (run_to_completion)
+               return;
+       spin_lock_irqsave(&intf->xmit_msgs_lock, *flags);
+}
+
+static void ipmi_unlock_xmit_msgs(struct ipmi_smi *intf, int run_to_completion,
+                                 unsigned long *flags)
+{
+       if (run_to_completion)
+               return;
+       spin_unlock_irqrestore(&intf->xmit_msgs_lock, *flags);
+}
+
 static void free_ipmi_user(struct kref *ref)
 {
        struct ipmi_user *user = container_of(ref, struct ipmi_user, refcount);
@@ -1878,11 +1894,9 @@ static void smi_send(struct ipmi_smi *intf,
        int run_to_completion = READ_ONCE(intf->run_to_completion);
        unsigned long flags = 0;
 
-       if (!run_to_completion)
-               spin_lock_irqsave(&intf->xmit_msgs_lock, flags);
+       ipmi_lock_xmit_msgs(intf, run_to_completion, &flags);
        smi_msg = smi_add_send_msg(intf, smi_msg, priority);
-       if (!run_to_completion)
-               spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);
+       ipmi_unlock_xmit_msgs(intf, run_to_completion, &flags);
 
        if (smi_msg)
                handlers->sender(intf->send_info, smi_msg);
@@ -4826,8 +4840,7 @@ static void smi_work(struct work_struct *t)
         * message delivery.
         */
 restart:
-       if (!run_to_completion)
-               spin_lock_irqsave(&intf->xmit_msgs_lock, flags);
+       ipmi_lock_xmit_msgs(intf, run_to_completion, &flags);
        if (intf->curr_msg == NULL && !intf->in_shutdown) {
                struct list_head *entry = NULL;
 
@@ -4843,8 +4856,7 @@ restart:
                        intf->curr_msg = newmsg;
                }
        }
-       if (!run_to_completion)
-               spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);
+       ipmi_unlock_xmit_msgs(intf, run_to_completion, &flags);
 
        if (newmsg) {
                cc = intf->handlers->sender(intf->send_info, newmsg);
@@ -4852,13 +4864,9 @@ restart:
                        if (newmsg->recv_msg)
                                deliver_err_response(intf,
                                                     newmsg->recv_msg, cc);
-                       if (!run_to_completion)
-                               spin_lock_irqsave(&intf->xmit_msgs_lock,
-                                                 flags);
+                       ipmi_lock_xmit_msgs(intf, run_to_completion, &flags);
                        intf->curr_msg = NULL;
-                       if (!run_to_completion)
-                               spin_unlock_irqrestore(&intf->xmit_msgs_lock,
-                                                      flags);
+                       ipmi_unlock_xmit_msgs(intf, run_to_completion, &flags);
                        ipmi_free_smi_msg(newmsg);
                        newmsg = NULL;
                        goto restart;
@@ -4928,16 +4936,14 @@ void ipmi_smi_msg_received(struct ipmi_smi *intf,
                spin_unlock_irqrestore(&intf->waiting_rcv_msgs_lock,
                                       flags);
 
-       if (!run_to_completion)
-               spin_lock_irqsave(&intf->xmit_msgs_lock, flags);
+       ipmi_lock_xmit_msgs(intf, run_to_completion, &flags);
        /*
         * We can get an asynchronous event or receive message in addition
         * to commands we send.
         */
        if (msg == intf->curr_msg)
                intf->curr_msg = NULL;
-       if (!run_to_completion)
-               spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);
+       ipmi_unlock_xmit_msgs(intf, run_to_completion, &flags);
 
        if (run_to_completion)
                smi_work(&intf->smi_work);