diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2022-05-20 18:48:54 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2022-05-20 18:48:54 +0200 |
commit | cdb4913293897dde0df522ed5789ba016f3b9157 (patch) | |
tree | 32c3dbbc27f1a79b74760a240f2768ea82f7e5cb /drivers/irqchip/irq-sun6i-r.c | |
parent | 21673fcb2532dcd189905ff5a5389eb7dcd0e57a (diff) | |
parent | 492449ae4f0ad96948c3e029ca00736a7f1b3d77 (diff) | |
download | linux-cdb4913293897dde0df522ed5789ba016f3b9157.tar.bz2 |
Merge tag 'irqchip-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull irqchip updates from Marc Zyngier:
- Add new infrastructure to stop gpiolib from rewriting irq_chip
structures behind our back. Convert a few of them, but this will
obviously be a long effort.
- A bunch of GICv3 improvements, such as using MMIO-based invalidations
when possible, and reducing the amount of polling we perform when
reconfiguring interrupts.
- Another set of GICv3 improvements for the Pseudo-NMI functionality,
with a nice cleanup making it easy to reason about the various
states we can be in when an NMI fires.
- The usual bunch of misc fixes and minor improvements.
Link: https://lore.kernel.org/all/20220519165308.998315-1-maz@kernel.org
Diffstat (limited to 'drivers/irqchip/irq-sun6i-r.c')
-rw-r--r-- | drivers/irqchip/irq-sun6i-r.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-sun6i-r.c b/drivers/irqchip/irq-sun6i-r.c index 4cd3e533740b..a01e44049415 100644 --- a/drivers/irqchip/irq-sun6i-r.c +++ b/drivers/irqchip/irq-sun6i-r.c @@ -249,11 +249,13 @@ static int sun6i_r_intc_domain_alloc(struct irq_domain *domain, for (i = 0; i < nr_irqs; ++i, ++hwirq, ++virq) { if (hwirq == nmi_hwirq) { irq_domain_set_hwirq_and_chip(domain, virq, hwirq, - &sun6i_r_intc_nmi_chip, 0); + &sun6i_r_intc_nmi_chip, + NULL); irq_set_handler(virq, handle_fasteoi_ack_irq); } else { irq_domain_set_hwirq_and_chip(domain, virq, hwirq, - &sun6i_r_intc_wakeup_chip, 0); + &sun6i_r_intc_wakeup_chip, + NULL); } } |