Merge tag 'v3.12-rc4' into devel

[karo-tx-linux.git] / drivers / gpio / gpio-rcar.c

diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index 6038966ab045529b071242424e49b12237db316a..be3e9c27c4919300bdaa14f44aae89c6354f2878 100644 (file)
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -266,16 +266,16 @@ static int gpio_rcar_to_irq(struct gpio_chip *chip, unsigned offset)
        return irq_create_mapping(gpio_to_priv(chip)->irq_domain, offset);
 }
 
-static int gpio_rcar_irq_domain_map(struct irq_domain *h, unsigned int virq,
-                                irq_hw_number_t hw)
+static int gpio_rcar_irq_domain_map(struct irq_domain *h, unsigned int irq,
+                                irq_hw_number_t hwirq)
 {
        struct gpio_rcar_priv *p = h->host_data;
 
-       dev_dbg(&p->pdev->dev, "map hw irq = %d, virq = %d\n", (int)hw, virq);
+       dev_dbg(&p->pdev->dev, "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;
 }