[tip: irq/drivers] irqchip/renesas-rzv2h: Kill swint_names[]
From: tip-bot2 for Geert Uytterhoeven
Date: Tue Apr 07 2026 - 05:20:31 EST
The following commit has been merged into the irq/drivers branch of tip:
Commit-ID: 8c7ffedff0db88837de11cfaf3e5367e0b77bc4c
Gitweb: https://git.kernel.org/tip/8c7ffedff0db88837de11cfaf3e5367e0b77bc4c
Author: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
AuthorDate: Fri, 03 Apr 2026 10:48:22 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxx>
CommitterDate: Tue, 07 Apr 2026 11:19:01 +02:00
irqchip/renesas-rzv2h: Kill swint_names[]
The array swint_names[] just contains expansions of "int-ca55-%u".
Replace it by formatting the strings where needed, to improve
readability.
Despite the two error messages can no longer be shared with the ICU
error cases, this reduces generated code size by 56 bytes.
Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxx>
Reviewed-by: Biju Das <biju.das.jz@xxxxxxxxxxxxxx>
Link: https://patch.msgid.link/aceab3fbc307ef428dfd62d8d846b68704dea012.1775205874.git.geert+renesas@xxxxxxxxx
---
drivers/irqchip/irq-renesas-rzv2h.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/irqchip/irq-renesas-rzv2h.c b/drivers/irqchip/irq-renesas-rzv2h.c
index 9461f19..c701e46 100644
--- a/drivers/irqchip/irq-renesas-rzv2h.c
+++ b/drivers/irqchip/irq-renesas-rzv2h.c
@@ -755,10 +755,6 @@ static int rzv2h_icu_setup_irqs(struct platform_device *pdev, struct irq_domain
{
const struct rzv2h_hw_info *hw_info = rzv2h_icu_data->info;
bool irq_inject = IS_ENABLED(CONFIG_GENERIC_IRQ_INJECTION);
- static const char * const rzv2h_swint_names[] = {
- "int-ca55-0", "int-ca55-1",
- "int-ca55-2", "int-ca55-3",
- };
static const char *icu_err = "icu-error-ca55";
void __iomem *base = rzv2h_icu_data->base;
struct device *dev = &pdev->dev;
@@ -774,16 +770,14 @@ static int rzv2h_icu_setup_irqs(struct platform_device *pdev, struct irq_domain
virq = irq_create_fwspec_mapping(&fwspec);
if (!virq) {
- return dev_err_probe(dev, -EINVAL, "failed to create IRQ mapping for %s\n",
- rzv2h_swint_names[i]);
+ return dev_err_probe(dev, -EINVAL,
+ "failed to create int-ca55-%u IRQ mapping\n", i);
}
ret = devm_request_irq(dev, virq, rzv2h_icu_swint_irq, 0, dev_name(dev),
(void *)(uintptr_t)i);
- if (ret) {
- return dev_err_probe(dev, ret, "Failed to request %s IRQ\n",
- rzv2h_swint_names[i]);
- }
+ if (ret)
+ return dev_err_probe(dev, ret, "Failed to request int-ca55-%u IRQ\n", i);
}
/* Unmask and clear all IP/CA55 error interrupts */