Merge tag 'devm-helpers-v5.14-1' into review-hans

[J-linux.git] / drivers / platform / surface / aggregator / ssh_packet_layer.c

diff --git a/drivers/platform/surface/aggregator/ssh_packet_layer.c b/drivers/platform/surface/aggregator/ssh_packet_layer.c
index 15d96eac6811fc39a38f37bb7b860c33a082bdd4..8a4451c1ffe57d1672cefbf69ee9804401c8dc29 100644 (file)
--- a/drivers/platform/surface/aggregator/ssh_packet_layer.c
+++ b/drivers/platform/surface/aggregator/ssh_packet_layer.c
@@ -2,7 +2,7 @@
 /*
  * SSH packet transport layer.
  *
- * Copyright (C) 2019-2020 Maximilian Luz <[email protected]>
+ * Copyright (C) 2019-2021 Maximilian Luz <[email protected]>
  */
 
 #include <asm/unaligned.h>
@@ -1567,9 +1567,7 @@ static void ssh_ptl_timeout_reap(struct work_struct *work)
                clear_bit(SSH_PACKET_SF_PENDING_BIT, &p->state);
 
                atomic_dec(&ptl->pending.count);
-               list_del(&p->pending_node);
-
-               list_add_tail(&p->pending_node, &claimed);
+               list_move_tail(&p->pending_node, &claimed);
        }
 
        spin_unlock(&ptl->pending.lock);
@@ -1957,8 +1955,7 @@ void ssh_ptl_shutdown(struct ssh_ptl *ptl)
                smp_mb__before_atomic();
                clear_bit(SSH_PACKET_SF_QUEUED_BIT, &p->state);
 
-               list_del(&p->queue_node);
-               list_add_tail(&p->queue_node, &complete_q);
+               list_move_tail(&p->queue_node, &complete_q);
        }
        spin_unlock(&ptl->queue.lock);
 
@@ -1970,8 +1967,7 @@ void ssh_ptl_shutdown(struct ssh_ptl *ptl)
                smp_mb__before_atomic();
                clear_bit(SSH_PACKET_SF_PENDING_BIT, &p->state);
 
-               list_del(&p->pending_node);
-               list_add_tail(&p->pending_node, &complete_q);
+               list_move_tail(&p->pending_node, &complete_q);
        }
        atomic_set(&ptl->pending.count, 0);
        spin_unlock(&ptl->pending.lock);