[PATCH] drivers: use list_move()

This patch converts the combination of list_del(A) and list_add(A, B) to
list_move(A, B) under drivers/.

Acked-by: Corey Minyard <minyard@mvista.com>
Cc: Ben Collins <bcollins@debian.org>
Acked-by: Roland Dreier <rolandd@cisco.com>
Cc: Alasdair Kergon <dm-devel@redhat.com>
Cc: Gerd Knorr <kraxel@bytesex.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Frank Pavlic <fpavlic@de.ibm.com>
Acked-by: Matthew Wilcox <matthew@wil.cx>
Cc: Andrew Vasquez <linux-driver@qlogic.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Akinobu Mita <mita@miraclelinux.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 6 insertions, 12 deletions

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index b38e02a5db35..5ed4dab52a6f 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -1775,11 +1775,9 @@ ib_find_send_mad(struct ib_mad_agent_private *mad_agent_priv,
 void ib_mark_mad_done(struct ib_mad_send_wr_private *mad_send_wr)
 {
         mad_send_wr->timeout = 0;
-        if (mad_send_wr->refcount == 1) {
-                list_del(&mad_send_wr->agent_list);
-                list_add_tail(&mad_send_wr->agent_list,
+        if (mad_send_wr->refcount == 1)
+                list_move_tail(&mad_send_wr->agent_list,
                               &mad_send_wr->mad_agent_priv->done_list);
-        }
 }
 
 static void ib_mad_complete_recv(struct ib_mad_agent_private *mad_agent_priv,
@@ -2098,8 +2096,7 @@ retry:
                 queued_send_wr = container_of(mad_list,
                                         struct ib_mad_send_wr_private,
                                         mad_list);
-                list_del(&mad_list->list);
-                list_add_tail(&mad_list->list, &send_queue->list);
+                list_move_tail(&mad_list->list, &send_queue->list);
         }
         spin_unlock_irqrestore(&send_queue->lock, flags);
 
diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c
index d4704e054e30..ebcd5b181770 100644
--- a/drivers/infiniband/core/mad_rmpp.c
+++ b/drivers/infiniband/core/mad_rmpp.c
@@ -665,8 +665,7 @@ static void process_rmpp_ack(struct ib_mad_agent_private *agent,
                         goto out;
 
                 mad_send_wr->refcount++;
-                list_del(&mad_send_wr->agent_list);
-                list_add_tail(&mad_send_wr->agent_list,
+                list_move_tail(&mad_send_wr->agent_list,
                               &mad_send_wr->mad_agent_priv->send_list);
         }
 out:
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 216471fa01cc..ab40488182b3 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -864,8 +864,7 @@ void ipoib_mcast_restart_task(void *dev_ptr)
 
                         if (mcast) {
                                 /* Destroy the send only entry */
-                                list_del(&mcast->list);
-                                list_add_tail(&mcast->list, &remove_list);
+                                list_move_tail(&mcast->list, &remove_list);
 
                                 rb_replace_node(&mcast->rb_node,
                                                 &nmcast->rb_node,
@@ -890,8 +889,7 @@ void ipoib_mcast_restart_task(void *dev_ptr)
                         rb_erase(&mcast->rb_node, &priv->multicast_tree);
 
                         /* Move to the remove list */
-                        list_del(&mcast->list);
-                        list_add_tail(&mcast->list, &remove_list);
+                        list_move_tail(&mcast->list, &remove_list);
                 }
         }