]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
irqchip/renesas-rzv2h: Drop irqchip from struct rzv2h_icu_priv
authorBiju Das <biju.das.jz@bp.renesas.com>
Mon, 24 Feb 2025 13:11:19 +0000 (13:11 +0000)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 26 Feb 2025 10:59:49 +0000 (11:59 +0100)
Use rzv2h_icu_chip directly on irq_domain_set_hwirq_and_chip() and drop
the global variable irqchip from struct rzv2h_icu_priv.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Fabrizio Castro <fabrizio.castro.jz@renesas.com>
Reviewed-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/all/20250224131253.134199-4-biju.das.jz@bp.renesas.com
drivers/irqchip/irq-renesas-rzv2h.c

index f6363246a71a0b2fd17b4e2889e87e3c497f39f2..0573062c89c45f61a92d48bd86d914f6c841cc27 100644 (file)
 /**
  * struct rzv2h_icu_priv - Interrupt Control Unit controller private data structure.
  * @base:      Controller's base address
- * @irqchip:   Pointer to struct irq_chip
  * @fwspec:    IRQ firmware specific data
  * @lock:      Lock to serialize access to hardware registers
  */
 struct rzv2h_icu_priv {
        void __iomem                    *base;
-       const struct irq_chip           *irqchip;
        struct irq_fwspec               fwspec[ICU_NUM_IRQ];
        raw_spinlock_t                  lock;
 };
@@ -390,7 +388,7 @@ static int rzv2h_icu_alloc(struct irq_domain *domain, unsigned int virq, unsigne
        if (hwirq > (ICU_NUM_IRQ - 1))
                return -EINVAL;
 
-       ret = irq_domain_set_hwirq_and_chip(domain, virq, hwirq, priv->irqchip,
+       ret = irq_domain_set_hwirq_and_chip(domain, virq, hwirq, &rzv2h_icu_chip,
                                            (void *)(uintptr_t)tint);
        if (ret)
                return ret;
@@ -446,8 +444,6 @@ static int rzv2h_icu_init(struct device_node *node, struct device_node *parent)
                goto put_dev;
        }
 
-       rzv2h_icu_data->irqchip = &rzv2h_icu_chip;
-
        rzv2h_icu_data->base = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, NULL);
        if (IS_ERR(rzv2h_icu_data->base)) {
                ret = PTR_ERR(rzv2h_icu_data->base);