The following commit has been merged into the irq/core branch of tip:
Commit-ID: e2dda25a6d2eaddb3e42f0843904ab7908ab3db3
Gitweb: https://git.kernel.org/tip/e2dda25a6d2eaddb3e42f0843904ab7908ab3db3
Author: Marek Behún <kabel@xxxxxxxxxx>
AuthorDate: Thu, 11 Jul 2024 13:57:42 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Mon, 29 Jul 2024 10:57:23 +02:00
irqchip/armada-370-xp: Simplify ipi_resume() code
Refactor the ipi_resume() function to drop one indentation level.
Signed-off-by: Marek Behún <kabel@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Reviewed-by: Andrew Lunn <andrew@xxxxxxx>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/all/20240711115748.30268-5-kabel@xxxxxxxxxx
---
drivers/irqchip/irq-armada-370-xp.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index c007610..316c27c 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -462,16 +462,14 @@ static const struct irq_domain_ops ipi_domain_ops = {
static void ipi_resume(void)
{
for (int i = 0; i < IPI_DOORBELL_END; i++) {
- unsigned int virq;
+ unsigned int virq = irq_find_mapping(ipi_domain, i);
+ struct irq_data *d;
- virq = irq_find_mapping(ipi_domain, i);
- if (!virq)
+ if (!virq || !irq_percpu_is_enabled(virq))
continue;
- if (irq_percpu_is_enabled(virq)) {
- struct irq_data *d;
- d = irq_domain_get_irq_data(ipi_domain, virq);
- armada_370_xp_ipi_unmask(d);
- }
+
+ d = irq_domain_get_irq_data(ipi_domain, virq);
+ armada_370_xp_ipi_unmask(d);
}
}
|