From: Thorsten Blum <thorsten.blum@linux.dev>
To: Rich Felker <dalias@libc.org>,
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
Kees Cook <kees@kernel.org>
Cc: Thorsten Blum <thorsten.blum@linux.dev>,
linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] sh: sq: use str_plural helper in sq_remap
Date: Thu, 4 Jun 2026 13:12:36 +0200 [thread overview]
Message-ID: <20260604111237.1297783-2-thorsten.blum@linux.dev> (raw)
Replace the manual ternary "s" pluralization with str_plural() to
simplify the code. Use the format specifier %-1s to preserve the
whitespace alignment.
Simplify the map->name ternary expression while at it.
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
arch/sh/kernel/cpu/sh4/sq.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index 908a8e09113b..0f9244be6dcc 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -14,6 +14,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
+#include <linux/string_choices.h>
#include <linux/vmalloc.h>
#include <linux/mm.h>
#include <linux/io.h>
@@ -181,9 +182,8 @@ unsigned long sq_remap(unsigned long phys, unsigned int size,
goto out;
psz = (size + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
- pr_info("sqremap: %15s [%4d page%s] va 0x%08lx pa 0x%08lx\n",
- likely(map->name) ? map->name : "???",
- psz, psz == 1 ? " " : "s",
+ pr_info("sqremap: %15s [%4d page%-1s] va 0x%08lx pa 0x%08lx\n",
+ map->name ?: "???", psz, str_plural(psz),
map->sq_addr, map->addr);
sq_mapping_list_add(map);
next reply other threads:[~2026-06-04 11:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-04 11:12 Thorsten Blum [this message]
2026-06-04 11:30 ` [PATCH] sh: sq: use str_plural helper in sq_remap Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260604111237.1297783-2-thorsten.blum@linux.dev \
--to=thorsten.blum@linux.dev \
--cc=dalias@libc.org \
--cc=glaubitz@physik.fu-berlin.de \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.