gpio: pl061: drop references to "virtual" IRQ
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 11 Oct 2013 17:40:16 +0000 (19:40 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 16 Oct 2013 07:59:52 +0000 (09:59 +0200)
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: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-pl061.c

index 4274e2e70ef8e8e31fcdb6da0370ae265f383190..f22f7f3e2e531592ffb313c253c50e75b73b3337 100644 (file)
@@ -238,15 +238,15 @@ static struct irq_chip pl061_irqchip = {
        .irq_set_type   = pl061_irq_type,
 };
 
-static int pl061_irq_map(struct irq_domain *d, unsigned int virq,
-                        irq_hw_number_t hw)
+static int pl061_irq_map(struct irq_domain *d, unsigned int irq,
+                        irq_hw_number_t hwirq)
 {
        struct pl061_gpio *chip = d->host_data;
 
-       irq_set_chip_and_handler_name(virq, &pl061_irqchip, handle_simple_irq,
+       irq_set_chip_and_handler_name(irq, &pl061_irqchip, handle_simple_irq,
                                      "pl061");
-       irq_set_chip_data(virq, chip);
-       irq_set_irq_type(virq, IRQ_TYPE_NONE);
+       irq_set_chip_data(irq, chip);
+       irq_set_irq_type(irq, IRQ_TYPE_NONE);
 
        return 0;
 }