irqchip/lpc32xx: Switch to dynamic chip name output

Instead of overriding the name field with the device name, use
the relevant callback. This allows us to make the irq_chip structure
const.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20220209162607.1118325-5-maz@kernel.org

diff --git a/drivers/irqchip/irq-lpc32xx.c b/drivers/irqchip/irq-lpc32xx.c
index a29357f394506b8b30c0d0f09fa321382c4a6b29..4d70a857133f4c6f605863835a6b2d046247a21d 100644 (file)
--- a/drivers/irqchip/irq-lpc32xx.c
+++ b/drivers/irqchip/irq-lpc32xx.c
@@ -11,6 +11,7 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <asm/exception.h>
 
@@ -25,8 +26,8 @@
 
 struct lpc32xx_irq_chip {
        void __iomem *base;
+       phys_addr_t addr;
        struct irq_domain *domain;
-       struct irq_chip chip;
 };
 
 static struct lpc32xx_irq_chip *lpc32xx_mic_irqc;
@@ -118,6 +119,24 @@ static int lpc32xx_irq_set_type(struct irq_data *d, unsigned int type)
        return 0;
 }
 
+static void lpc32xx_irq_print_chip(struct irq_data *d, struct seq_file *p)
+{
+       struct lpc32xx_irq_chip *ic = irq_data_get_irq_chip_data(d);
+
+       if (ic == lpc32xx_mic_irqc)
+               seq_printf(p, "%08x.mic", ic->addr);
+       else
+               seq_printf(p, "%08x.sic", ic->addr);
+}
+
+static const struct irq_chip lpc32xx_chip = {
+       .irq_ack        = lpc32xx_irq_ack,
+       .irq_mask       = lpc32xx_irq_mask,
+       .irq_unmask     = lpc32xx_irq_unmask,
+       .irq_set_type   = lpc32xx_irq_set_type,
+       .irq_print_chip = lpc32xx_irq_print_chip,
+};
+
 static void __exception_irq_entry lpc32xx_handle_irq(struct pt_regs *regs)
 {
        struct lpc32xx_irq_chip *ic = lpc32xx_mic_irqc;
@@ -153,7 +172,7 @@ static int lpc32xx_irq_domain_map(struct irq_domain *id, unsigned int virq,
        struct lpc32xx_irq_chip *ic = id->host_data;
 
        irq_set_chip_data(virq, ic);
-       irq_set_chip_and_handler(virq, &ic->chip, handle_level_irq);
+       irq_set_chip_and_handler(virq, &lpc32xx_chip, handle_level_irq);
        irq_set_status_flags(virq, IRQ_LEVEL);
        irq_set_noprobe(virq);
 
@@ -183,6 +202,7 @@ static int __init lpc32xx_of_ic_init(struct device_node *node,
        if (!irqc)
                return -ENOMEM;
 
+       irqc->addr = addr;
        irqc->base = of_iomap(node, 0);
        if (!irqc->base) {
                pr_err("%pOF: unable to map registers\n", node);
@@ -190,21 +210,11 @@ static int __init lpc32xx_of_ic_init(struct device_node *node,
                return -EINVAL;
        }
 
-       irqc->chip.irq_ack = lpc32xx_irq_ack;
-       irqc->chip.irq_mask = lpc32xx_irq_mask;
-       irqc->chip.irq_unmask = lpc32xx_irq_unmask;
-       irqc->chip.irq_set_type = lpc32xx_irq_set_type;
-       if (is_mic)
-               irqc->chip.name = kasprintf(GFP_KERNEL, "%08x.mic", addr);
-       else
-               irqc->chip.name = kasprintf(GFP_KERNEL, "%08x.sic", addr);
-
        irqc->domain = irq_domain_add_linear(node, NR_LPC32XX_IC_IRQS,
                                             &lpc32xx_irq_domain_ops, irqc);
        if (!irqc->domain) {
                pr_err("unable to add irq domain\n");
                iounmap(irqc->base);
-               kfree(irqc->chip.name);
                kfree(irqc);
                return -ENODEV;
        }