2024-04-03 23:50:57

by Thorsten Blum

Subject: [PATCH] tty: xtensa/iss: Use umin() to fix Coccinelle warning

Use unsigned size_t to improve len data type and umin() to fix the
following Coccinelle/coccicheck warning reported by minmax.cocci:

WARNING opportunity for min()

Signed-off-by: Thorsten Blum <[email protected]>
---
arch/xtensa/platforms/iss/console.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 8896e691c051..b493fc50933d 100644
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -167,8 +167,9 @@ 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);
+ size_t len = strlen(s);
+
+ simc_write(1, s, umin(count, len));
}
}

--
2.44.0

2024-04-04 02:11:03

by Max Filippov

Subject: Re: [PATCH] tty: xtensa/iss: Use umin() to fix Coccinelle warning

On Wed, Apr 3, 2024 at 4:48 PM Thorsten Blum <[email protected]> wrote:
>
> Use unsigned size_t to improve len data type and umin() to fix the
> following Coccinelle/coccicheck warning reported by minmax.cocci:
>
> WARNING opportunity for min()
>
> Signed-off-by: Thorsten Blum <[email protected]>
> ---
> arch/xtensa/platforms/iss/console.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)

Thanks. Applied to my xtensa tree.

-- Max

2024-04-04 05:07:14

by Jiri Slaby

Subject: Re: [PATCH] tty: xtensa/iss: Use umin() to fix Coccinelle warning

On 04. 04. 24, 1:47, Thorsten Blum wrote:
> Use unsigned size_t to improve len data type and umin() to fix the
> following Coccinelle/coccicheck warning reported by minmax.cocci:
>
> WARNING opportunity for min()
>
> Signed-off-by: Thorsten Blum <[email protected]>
> ---
> arch/xtensa/platforms/iss/console.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
> index 8896e691c051..b493fc50933d 100644
> --- a/arch/xtensa/platforms/iss/console.c
> +++ b/arch/xtensa/platforms/iss/console.c
> @@ -167,8 +167,9 @@ 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);
> + size_t len = strlen(s);
> +
> + simc_write(1, s, umin(count, len));

The cast to unsigned (ie. umin()) is now not necessary. You should have
used min() as was suggested, right?

> }
> }
>

thanks,
--
js
suse labs

2024-04-04 07:36:39

by Thorsten Blum

Subject: Re: [PATCH] tty: xtensa/iss: Use umin() to fix Coccinelle warning

On 4. Apr 2024, at 07:05, Jiri Slaby <[email protected]> wrote:
>
> The cast to unsigned (ie. umin()) is now not necessary. You should have used min() as was suggested, right?

Yes, umin() was only necessary before I casted len from int to size_t.

I'll submit a v2 shortly.

Thanks,
Thorsten

2024-04-04 07:38:46

by Thorsten Blum

Subject: [PATCH v2] tty: xtensa/iss: Use min() to fix Coccinelle warning

Use unsigned size_t to improve len data type and min() to fix the
following Coccinelle/coccicheck warning reported by minmax.cocci:

WARNING opportunity for min()

Signed-off-by: Thorsten Blum <[email protected]>
---
Changes in v2:
- Use min() instead of umin() as suggested by Jiri Slaby
---
arch/xtensa/platforms/iss/console.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 8896e691c051..d2380767f3a4 100644
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -167,8 +167,9 @@ 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);
+ size_t len = strlen(s);
+
+ simc_write(1, s, min(count, len));
}
}

--
2.44.0

2024-04-04 07:41:48

by Jiri Slaby

Subject: Re: [PATCH v2] tty: xtensa/iss: Use min() to fix Coccinelle warning

On 04. 04. 24, 9:38, Thorsten Blum wrote:
> Use unsigned size_t to improve len data type and min() to fix the
> following Coccinelle/coccicheck warning reported by minmax.cocci:
>
> WARNING opportunity for min()
>
> Signed-off-by: Thorsten Blum <[email protected]>
> ---
> Changes in v2:
> - Use min() instead of umin() as suggested by Jiri Slaby
> ---
> arch/xtensa/platforms/iss/console.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
> index 8896e691c051..d2380767f3a4 100644
> --- a/arch/xtensa/platforms/iss/console.c
> +++ b/arch/xtensa/platforms/iss/console.c
> @@ -167,8 +167,9 @@ 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);
> + size_t len = strlen(s);
> +
> + simc_write(1, s, min(count, len));

So do you need 'len' after all :)?

if (s && *s != 0)
simc_write(1, s, min(count, strlen(s)));

sounds good.

> }
> }
>

--
js
suse labs

2024-04-04 08:01:22

by Thorsten Blum

Subject: [PATCH v3] tty: xtensa/iss: Use min() to fix Coccinelle warning

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 <[email protected]>
---
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

2024-04-04 08:11:26

by Jiri Slaby

Subject: Re: [PATCH v3] tty: xtensa/iss: Use min() to fix Coccinelle warning

On 04. 04. 24, 9:58, Thorsten Blum wrote:
> 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 <[email protected]>

Reviewed-by: Jiri Slaby <[email protected]>

Thanks.

> ---
> 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)

--
js
suse labs

2024-04-04 09:12:35

by Max Filippov

Subject: Re: [PATCH v3] tty: xtensa/iss: Use min() to fix Coccinelle warning

On Thu, Apr 4, 2024 at 1:01 AM Thorsten Blum <[email protected]> wrote:
>
> 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 <[email protected]>
> ---
> 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(-)

Thanks. Applied to my xtensa tree.

-- Max