From: Marek Behún Date: Thu, 11 Jul 2024 16:09:01 +0000 (+0200) Subject: irqchip/armada-370-xp: Simplify mpic_reenable_percpu() and mpic_resume() X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=15a50eeaadc169243b00ec90087f689a8a28848e;p=users%2Fjedix%2Flinux-maple.git irqchip/armada-370-xp: Simplify mpic_reenable_percpu() and mpic_resume() Refactor the mpic_reenable_percpu() and mpic_resume() functions to make them a little bit simpler. Signed-off-by: Marek Behún Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/all/20240711160907.31012-5-kabel@kernel.org --- diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 98f90a3d62d82..66e14f1183d14 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -517,18 +517,13 @@ static void mpic_reenable_percpu(void) { /* Re-enable per-CPU interrupts that were enabled before suspend */ for (irq_hw_number_t i = 0; i < MPIC_MAX_PER_CPU_IRQS; i++) { + unsigned int virq = irq_linear_revmap(mpic_domain, i); struct irq_data *d; - unsigned int virq; - virq = irq_linear_revmap(mpic_domain, i); - if (!virq) + if (!virq || !irq_percpu_is_enabled(virq)) continue; d = irq_get_irq_data(virq); - - if (!irq_percpu_is_enabled(virq)) - continue; - mpic_irq_unmask(d); } @@ -706,10 +701,9 @@ static void mpic_resume(void) /* Re-enable interrupts */ for (irq_hw_number_t i = 0; i < mpic_domain->hwirq_max; i++) { + unsigned int virq = irq_linear_revmap(mpic_domain, i); struct irq_data *d; - unsigned int virq; - virq = irq_linear_revmap(mpic_domain, i); if (!virq) continue;