Received-SPF: pass (google.com: domain of linux-kernel+bounces-152651-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Thorsten Blum <thorsten.blum@toblux.com>
To: longman@redhat.com
Cc: boqun.feng@gmail.com,
	linux-kernel@vger.kernel.org,
	mingo@redhat.com,
	peterz@infradead.org,
	thorsten.blum@toblux.com,
	will@kernel.org
Subject: [RESEND PATCH] lockdep: Use str_plural() to fix Coccinelle warning
Date: Mon, 22 Apr 2024 01:17:56 +0200
Message-ID: <20240421231755.955755-2-thorsten.blum@toblux.com>
In-Reply-To: <9b15de60-b593-4b0c-bacc-ebe79de5d541@redhat.com>
References: <9b15de60-b593-4b0c-bacc-ebe79de5d541@redhat.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

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

	opportunity for str_plural(depth)

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Acked-by: Waiman Long <longman@redhat.com>
---
 kernel/locking/lockdep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 151bd3de5936..31d7720c9b8d 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -786,7 +786,7 @@ static void lockdep_print_held_locks(struct task_struct *p)
 		printk("no locks held by %s/%d.\n", p->comm, task_pid_nr(p));
 	else
 		printk("%d lock%s held by %s/%d:\n", depth,
-		       depth > 1 ? "s" : "", p->comm, task_pid_nr(p));
+		       str_plural(depth), p->comm, task_pid_nr(p));
 	/*
 	 * It's not reliable to print a task's held locks if it's not sleeping
 	 * and it's not the current task.
-- 
2.44.0