Re: [PATCH] sh: dma: use str_plural helper in register_dmac
Thorsten Blum <[email protected]> Thu, 4 Jun 2026 13:47:19 +0200
| Newsgroups | org.kernel.vger.linux-sh,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
Please note that this patch requires the following to apply cleanly: https://lore.kernel.org/lkml/[email protected]/ On Thu, Jun 04, 2026 at 01:34:42PM +0200, Thorsten Blum wrote: > Replace the manual ternary "s" pluralization with str_plural() to > simplify the code. This also corrects the "0 channels" case. > > Use pr_info() while at it. > > Signed-off-by: Thorsten Blum <[email protected]> > --- > arch/sh/drivers/dma/dma-api.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/sh/drivers/dma/dma-api.c b/arch/sh/drivers/dma/dma-api.c > index 31b614358270..7c8ee3a0bdf9 100644 > --- a/arch/sh/drivers/dma/dma-api.c > +++ b/arch/sh/drivers/dma/dma-api.c > @@ -17,6 +17,7 @@ > #include <linux/sched.h> > #include <linux/slab.h> > #include <linux/string.h> > +#include <linux/string_choices.h> > #include <asm/dma.h> > > DEFINE_SPINLOCK(dma_spin_lock); > @@ -200,8 +201,8 @@ int register_dmac(struct dma_info *info) > > INIT_LIST_HEAD(&info->list); > > - printk(KERN_INFO "DMA: Registering %s handler (%d channel%s).\n", > - info->name, info->nr_channels, info->nr_channels > 1 ? "s" : ""); > + pr_info("DMA: Registering %s handler (%d channel%s).\n", > + info->name, info->nr_channels, str_plural(info->nr_channels)); > > BUG_ON((info->flags & DMAC_CHANNELS_CONFIGURED) && !info->channels); >