Received-SPF: pass (google.com: domain of linux-kernel+bounces-131069-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Thorsten Blum <thorsten.blum@toblux.com>
To: jirislaby@kernel.org
Cc: chris@zankel.net,
	gregkh@linuxfoundation.org,
	jcmvbkbc@gmail.com,
	linux-kernel@vger.kernel.org,
	thorsten.blum@toblux.com
Subject: [PATCH v3] tty: xtensa/iss: Use min() to fix Coccinelle warning
Date: Thu,  4 Apr 2024 09:58:13 +0200
Message-ID: <20240404075811.6936-3-thorsten.blum@toblux.com>
In-Reply-To: <528c6824-287e-4be2-82f3-7fcdd254eb15@kernel.org>
References: <528c6824-287e-4be2-82f3-7fcdd254eb15@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Inline strlen() and use min() to fix the following Coccinelle/coccicheck
warning reported by minmax.cocci:

	WARNING opportunity for min()

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
---
Changes in v2:
- Use min() instead of umin() as suggested by Jiri Slaby

Changes in v3:
- Inline strlen() as suggested by Jiri Slaby
---
 arch/xtensa/platforms/iss/console.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 8896e691c051..abec44b687df 100644
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -166,10 +166,8 @@ late_initcall(rs_init);
 
 static void iss_console_write(struct console *co, const char *s, unsigned count)
 {
-	if (s && *s != 0) {
-		int len = strlen(s);
-		simc_write(1, s, count < len ? count : len);
-	}
+	if (s && *s != 0)
+		simc_write(1, s, min(count, strlen(s)));
 }
 
 static struct tty_driver* iss_console_device(struct console *c, int *index)
-- 
2.44.0