Skip to content

Commit c56cab0

Browse files
bijudasKAGA-KOKO
authored andcommitted
irqchip/renesas-rzv2h: Drop irqchip from struct rzv2h_icu_priv
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 <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Fabrizio Castro <[email protected]> Reviewed-by: Tommaso Merciai <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent 7231065 commit c56cab0

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

drivers/irqchip/irq-renesas-rzv2h.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,11 @@
8383
/**
8484
* struct rzv2h_icu_priv - Interrupt Control Unit controller private data structure.
8585
* @base: Controller's base address
86-
* @irqchip: Pointer to struct irq_chip
8786
* @fwspec: IRQ firmware specific data
8887
* @lock: Lock to serialize access to hardware registers
8988
*/
9089
struct rzv2h_icu_priv {
9190
void __iomem *base;
92-
const struct irq_chip *irqchip;
9391
struct irq_fwspec fwspec[ICU_NUM_IRQ];
9492
raw_spinlock_t lock;
9593
};
@@ -390,7 +388,7 @@ static int rzv2h_icu_alloc(struct irq_domain *domain, unsigned int virq, unsigne
390388
if (hwirq > (ICU_NUM_IRQ - 1))
391389
return -EINVAL;
392390

393-
ret = irq_domain_set_hwirq_and_chip(domain, virq, hwirq, priv->irqchip,
391+
ret = irq_domain_set_hwirq_and_chip(domain, virq, hwirq, &rzv2h_icu_chip,
394392
(void *)(uintptr_t)tint);
395393
if (ret)
396394
return ret;
@@ -446,8 +444,6 @@ static int rzv2h_icu_init(struct device_node *node, struct device_node *parent)
446444
goto put_dev;
447445
}
448446

449-
rzv2h_icu_data->irqchip = &rzv2h_icu_chip;
450-
451447
rzv2h_icu_data->base = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, NULL);
452448
if (IS_ERR(rzv2h_icu_data->base)) {
453449
ret = PTR_ERR(rzv2h_icu_data->base);

0 commit comments

Comments
 (0)