gpio: em: drop references to "virtual" IRQ

Rename the argument "virq" to just "irq", this IRQ isn't any
more "virtual" than any other Linux IRQ number, we use "hwirq"
for the actual hw-numbers, "virq" is just bogus.

Cc: Magnus Damm <damm@opensource.se>
Reviewed-by: Ian Molton <ian.molton@codethink.co.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index 160d759170a57fbca8374a237062dce12ecf3a35..ec190361bf2e551352a265fd2bcb576e71bd06f1 100644 (file)
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -232,16 +232,16 @@ static void em_gio_free(struct gpio_chip *chip, unsigned offset)
        em_gio_direction_input(chip, offset);
 }
 
-static int em_gio_irq_domain_map(struct irq_domain *h, unsigned int virq,
-                                irq_hw_number_t hw)
+static int em_gio_irq_domain_map(struct irq_domain *h, unsigned int irq,
+                                irq_hw_number_t hwirq)
 {
        struct em_gio_priv *p = h->host_data;
 
-       pr_debug("gio: map hw irq = %d, virq = %d\n", (int)hw, virq);
+       pr_debug("gio: map hw irq = %d, irq = %d\n", (int)hwirq, irq);
 
-       irq_set_chip_data(virq, h->host_data);
-       irq_set_chip_and_handler(virq, &p->irq_chip, handle_level_irq);
-       set_irq_flags(virq, IRQF_VALID); /* kill me now */
+       irq_set_chip_data(irq, h->host_data);
+       irq_set_chip_and_handler(irq, &p->irq_chip, handle_level_irq);
+       set_irq_flags(irq, IRQF_VALID); /* kill me now */
        return 0;
 }