tty: xtensa/iss: Use min() to fix Coccinelle warning

toblux · jcmvbkbc · commit 11cca8ccf2c3 · 2024-04-04T02:10:44.000-07:00
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 &lt;thorsten.blum@toblux.com&gt;
Message-Id: &lt;20240404075811.6936-3-thorsten.blum@toblux.com&gt;
Reviewed-by: Jiri Slaby &lt;jirislaby@kernel.org&gt;
Signed-off-by: Max Filippov &lt;jcmvbkbc@gmail.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -166,10 +166,8 @@ late_initcall(rs_init);`
`166`	`166`
`167`	`167`	`static void iss_console_write(struct console co, const char s, unsigned count)`
`168`	`168`	`{`
`169`		`- if (s && *s != 0) {`
`170`		`- int len = strlen(s);`
`171`		`- simc_write(1, s, count < len ? count : len);`
`172`		`- }`
	`169`	`+ if (s && *s != 0)`
	`170`	`+ simc_write(1, s, min(count, strlen(s)));`
`173`	`171`	`}`
`174`	`172`
`175`	`173`	`static struct tty_driver* iss_console_device(struct console c, int index)`