The following commit has been merged into the irq/core branch of tip:
Commit-ID: d258a2da44fe9986e787da056585da0765e78437
Gitweb: https://git.kernel.org/tip/d258a2da44fe9986e787da056585da0765e78437
Author: Marek Behún <kabel@xxxxxxxxxx>
AuthorDate: Thu, 11 Jul 2024 13:57:39 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Mon, 29 Jul 2024 10:57:22 +02:00
irqchip/armada-370-xp: Rename variable for consistency
Rename the irq variable to virq in the ipi_resume() function for
consistency with the rest of the code.
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-2-kabel@xxxxxxxxxx
---
drivers/irqchip/irq-armada-370-xp.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 22e1a49..7016b20 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -462,14 +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++) {
- int irq;
+ int virq;
- irq = irq_find_mapping(ipi_domain, i);
- if (irq <= 0)
+ virq = irq_find_mapping(ipi_domain, i);
+ if (virq <= 0)
continue;
- if (irq_percpu_is_enabled(irq)) {
+ if (irq_percpu_is_enabled(virq)) {
struct irq_data *d;
- d = irq_domain_get_irq_data(ipi_domain, irq);
+ d = irq_domain_get_irq_data(ipi_domain, virq);
armada_370_xp_ipi_unmask(d);
}
}
|