arch/powerpc/sysdev/fsl_msi.c | 2 +- drivers/bus/moxtet.c | 2 +- drivers/irqchip/irq-partition-percpu.c | 2 +- drivers/soc/qcom/smp2p.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
The space separator was factored out from the multiple chip name prints,
but several irq_chip.irq_print_chip() callbacks still print a leading
space. Remove the superfluous double spaces.
Fixes: 9d9f204bdf7243bf ("genirq/proc: Add missing space separator back")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Not even compile-tested...
Feel free to fold this into the original, and fix the spelling
s/previosuly/previously/ while at it.
---
arch/powerpc/sysdev/fsl_msi.c | 2 +-
drivers/bus/moxtet.c | 2 +-
drivers/irqchip/irq-partition-percpu.c | 2 +-
drivers/soc/qcom/smp2p.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 1aa0cb097c9c9d7c..7b9a5ea9cad9d3c7 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -75,7 +75,7 @@ static void fsl_msi_print_chip(struct irq_data *irqd, struct seq_file *p)
srs = (hwirq >> msi_data->srs_shift) & MSI_SRS_MASK;
cascade_virq = msi_data->cascade_array[srs]->virq;
- seq_printf(p, " fsl-msi-%d", cascade_virq);
+ seq_printf(p, "fsl-msi-%d", cascade_virq);
}
diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c
index 6276551d79680e85..1e57ebfb76229aa0 100644
--- a/drivers/bus/moxtet.c
+++ b/drivers/bus/moxtet.c
@@ -657,7 +657,7 @@ static void moxtet_irq_print_chip(struct irq_data *d, struct seq_file *p)
id = moxtet->modules[pos->idx];
- seq_printf(p, " moxtet-%s.%i#%i", mox_module_name(id), pos->idx,
+ seq_printf(p, "moxtet-%s.%i#%i", mox_module_name(id), pos->idx,
pos->bit);
}
diff --git a/drivers/irqchip/irq-partition-percpu.c b/drivers/irqchip/irq-partition-percpu.c
index 8e76d2913e6bebbf..4441ffe149ea0d96 100644
--- a/drivers/irqchip/irq-partition-percpu.c
+++ b/drivers/irqchip/irq-partition-percpu.c
@@ -98,7 +98,7 @@ static void partition_irq_print_chip(struct irq_data *d, struct seq_file *p)
struct irq_chip *chip = irq_desc_get_chip(part->chained_desc);
struct irq_data *data = irq_desc_get_irq_data(part->chained_desc);
- seq_printf(p, " %5s-%lu", chip->name, data->hwirq);
+ seq_printf(p, "%5s-%lu", chip->name, data->hwirq);
}
static struct irq_chip partition_irq_chip = {
diff --git a/drivers/soc/qcom/smp2p.c b/drivers/soc/qcom/smp2p.c
index 4783ab1adb8d953b..a3e88ced328a91f1 100644
--- a/drivers/soc/qcom/smp2p.c
+++ b/drivers/soc/qcom/smp2p.c
@@ -365,7 +365,7 @@ static void smp2p_irq_print_chip(struct irq_data *irqd, struct seq_file *p)
{
struct smp2p_entry *entry = irq_data_get_irq_chip_data(irqd);
- seq_printf(p, " %8s", dev_name(entry->smp2p->dev));
+ seq_printf(p, "%8s", dev_name(entry->smp2p->dev));
}
static struct irq_chip smp2p_irq_chip = {
--
2.34.1
HI,
At 2024-12-03 23:02:31, "Geert Uytterhoeven" <geert+renesas@glider.be> wrote:
>The space separator was factored out from the multiple chip name prints,
>but several irq_chip.irq_print_chip() callbacks still print a leading
>space. Remove the superfluous double spaces.
>
>Fixes: 9d9f204bdf7243bf ("genirq/proc: Add missing space separator back")
>Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>---
>Not even compile-tested...
>
>Feel free to fold this into the original, and fix the spelling
>s/previosuly/previously/ while at it.
>---
> arch/powerpc/sysdev/fsl_msi.c | 2 +-
> drivers/bus/moxtet.c | 2 +-
> drivers/irqchip/irq-partition-percpu.c | 2 +-
> drivers/soc/qcom/smp2p.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
>index 1aa0cb097c9c9d7c..7b9a5ea9cad9d3c7 100644
>--- a/arch/powerpc/sysdev/fsl_msi.c
>+++ b/arch/powerpc/sysdev/fsl_msi.c
>@@ -75,7 +75,7 @@ static void fsl_msi_print_chip(struct irq_data *irqd, struct seq_file *p)
> srs = (hwirq >> msi_data->srs_shift) & MSI_SRS_MASK;
> cascade_virq = msi_data->cascade_array[srs]->virq;
>
>- seq_printf(p, " fsl-msi-%d", cascade_virq);
>+ seq_printf(p, "fsl-msi-%d", cascade_virq);
> }
>
>
>diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c
>index 6276551d79680e85..1e57ebfb76229aa0 100644
>--- a/drivers/bus/moxtet.c
>+++ b/drivers/bus/moxtet.c
>@@ -657,7 +657,7 @@ static void moxtet_irq_print_chip(struct irq_data *d, struct seq_file *p)
>
> id = moxtet->modules[pos->idx];
>
>- seq_printf(p, " moxtet-%s.%i#%i", mox_module_name(id), pos->idx,
>+ seq_printf(p, "moxtet-%s.%i#%i", mox_module_name(id), pos->idx,
> pos->bit);
> }
>
>diff --git a/drivers/irqchip/irq-partition-percpu.c b/drivers/irqchip/irq-partition-percpu.c
>index 8e76d2913e6bebbf..4441ffe149ea0d96 100644
>--- a/drivers/irqchip/irq-partition-percpu.c
>+++ b/drivers/irqchip/irq-partition-percpu.c
>@@ -98,7 +98,7 @@ static void partition_irq_print_chip(struct irq_data *d, struct seq_file *p)
> struct irq_chip *chip = irq_desc_get_chip(part->chained_desc);
> struct irq_data *data = irq_desc_get_irq_data(part->chained_desc);
>
>- seq_printf(p, " %5s-%lu", chip->name, data->hwirq);
>+ seq_printf(p, "%5s-%lu", chip->name, data->hwirq);
> }
>
> static struct irq_chip partition_irq_chip = {
>diff --git a/drivers/soc/qcom/smp2p.c b/drivers/soc/qcom/smp2p.c
>index 4783ab1adb8d953b..a3e88ced328a91f1 100644
>--- a/drivers/soc/qcom/smp2p.c
>+++ b/drivers/soc/qcom/smp2p.c
>@@ -365,7 +365,7 @@ static void smp2p_irq_print_chip(struct irq_data *irqd, struct seq_file *p)
> {
> struct smp2p_entry *entry = irq_data_get_irq_chip_data(irqd);
>
>- seq_printf(p, " %8s", dev_name(entry->smp2p->dev));
>+ seq_printf(p, "%8s", dev_name(entry->smp2p->dev));
> }
>
> static struct irq_chip smp2p_irq_chip = {
>--
>2.34.1
Match with my check result against .irq_print_chip implementation under drivers.
But I think "%8s" and "%5s-%lu" should be "%s" and "%s-%lu", otherwise there would still
be leading spaces when the device name string is short.
Thanks
David
Hi David,
On Tue, Dec 3, 2024 at 4:34 PM David Wang <00107082@163.com> wrote:
> At 2024-12-03 23:02:31, "Geert Uytterhoeven" <geert+renesas@glider.be> wrote:
> >The space separator was factored out from the multiple chip name prints,
> >but several irq_chip.irq_print_chip() callbacks still print a leading
> >space. Remove the superfluous double spaces.
> >
> >Fixes: 9d9f204bdf7243bf ("genirq/proc: Add missing space separator back")
> >Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> >--- a/drivers/irqchip/irq-partition-percpu.c
> >+++ b/drivers/irqchip/irq-partition-percpu.c
> >@@ -98,7 +98,7 @@ static void partition_irq_print_chip(struct irq_data *d, struct seq_file *p)
> > struct irq_chip *chip = irq_desc_get_chip(part->chained_desc);
> > struct irq_data *data = irq_desc_get_irq_data(part->chained_desc);
> >
> >- seq_printf(p, " %5s-%lu", chip->name, data->hwirq);
> >+ seq_printf(p, "%5s-%lu", chip->name, data->hwirq);
> > }
> >
> > static struct irq_chip partition_irq_chip = {
> >diff --git a/drivers/soc/qcom/smp2p.c b/drivers/soc/qcom/smp2p.c
> >index 4783ab1adb8d953b..a3e88ced328a91f1 100644
> >--- a/drivers/soc/qcom/smp2p.c
> >+++ b/drivers/soc/qcom/smp2p.c
> >@@ -365,7 +365,7 @@ static void smp2p_irq_print_chip(struct irq_data *irqd, struct seq_file *p)
> > {
> > struct smp2p_entry *entry = irq_data_get_irq_chip_data(irqd);
> >
> >- seq_printf(p, " %8s", dev_name(entry->smp2p->dev));
> >+ seq_printf(p, "%8s", dev_name(entry->smp2p->dev));
> > }
> >
> > static struct irq_chip smp2p_irq_chip = {
> >--
> >2.34.1
>
> Match with my check result against .irq_print_chip implementation under drivers.
> But I think "%8s" and "%5s-%lu" should be "%s" and "%s-%lu", otherwise there would still
> be leading spaces when the device name string is short.
I believe these are present for alignment of later columns within the
same irqchip.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
© 2016 - 2025 Red Hat, Inc.