[tip: locking/core] locking/ww_mutex/test: Use swap() macro

From: tip-bot2 for Thorsten Blum
Date: Tue Dec 24 2024 - 13:55:40 EST


The following commit has been merged into the locking/core branch of tip:

Commit-ID: 0d3547df6934b8f9600630322799a2a76b4567d8
Gitweb: https://git.kernel.org/tip/0d3547df6934b8f9600630322799a2a76b4567d8
Author: Thorsten Blum <thorsten.blum@xxxxxxxxxx>
AuthorDate: Wed, 31 Jul 2024 15:58:51 +02:00
Committer: Boqun Feng <boqun.feng@xxxxxxxxx>
CommitterDate: Sun, 15 Dec 2024 11:49:35 -08:00

locking/ww_mutex/test: Use swap() macro

Fixes the following Coccinelle/coccicheck warning reported by
swap.cocci:

WARNING opportunity for swap()

Compile-tested only.

[Boqun: Add the report tags from Jiapeng and Abaci Robot [1].]

Reported-by: Abaci Robot <abaci@xxxxxxxxxxxxxxxxx>
Reported-by: Jiapeng Chong <jiapeng.chong@xxxxxxxxxxxxxxxxx>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=11531
Link: https://lore.kernel.org/r/20241025081455.55089-1-jiapeng.chong@xxxxxxxxxxxxxxxxx [1]
Acked-by: Waiman Long <longman@xxxxxxxxxx>
Signed-off-by: Thorsten Blum <thorsten.blum@xxxxxxxxxx>
Signed-off-by: Boqun Feng <boqun.feng@xxxxxxxxx>
Link: https://lore.kernel.org/r/20240731135850.81018-2-thorsten.blum@xxxxxxxxxx
---
kernel/locking/test-ww_mutex.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/kernel/locking/test-ww_mutex.c b/kernel/locking/test-ww_mutex.c
index 5d58b2c..bcb1b9f 100644
--- a/kernel/locking/test-ww_mutex.c
+++ b/kernel/locking/test-ww_mutex.c
@@ -404,7 +404,7 @@ static inline u32 prandom_u32_below(u32 ceil)
static int *get_random_order(int count)
{
int *order;
- int n, r, tmp;
+ int n, r;

order = kmalloc_array(count, sizeof(*order), GFP_KERNEL);
if (!order)
@@ -415,11 +415,8 @@ static int *get_random_order(int count)

for (n = count - 1; n > 1; n--) {
r = prandom_u32_below(n + 1);
- if (r != n) {
- tmp = order[n];
- order[n] = order[r];
- order[r] = tmp;
- }
+ if (r != n)
+ swap(order[n], order[r]);
}

return order;