The following commit has been merged into the irq/core branch of tip:
Commit-ID: 15a50eeaadc169243b00ec90087f689a8a28848e
Gitweb: https://git.kernel.org/tip/15a50eeaadc169243b00ec90087f689a8a28848e
Author: Marek Behún <kabel@xxxxxxxxxx>
AuthorDate: Thu, 11 Jul 2024 18:09:01 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Tue, 30 Jul 2024 13:35:48 +02:00
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 <kabel@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/all/20240711160907.31012-5-kabel@xxxxxxxxxx
---
drivers/irqchip/irq-armada-370-xp.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 98f90a3..66e14f1 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;
|