| From bec9700ceea72c20e7f80ae2c716896cc4eb1aa9 Mon Sep 17 00:00:00 2001 |
| From: Linus Walleij <linus.walleij@linaro.org> |
| Date: Fri, 11 Oct 2013 19:43:39 +0200 |
| Subject: gpio: rcar: 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> |
| Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| (cherry picked from commit c0d6c1ad0ad8fa1b7c2148ba918fd5d64a51166a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/gpio/gpio-rcar.c | 12 ++++++------ |
| 1 file changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c |
| index 0be07f22cb10..ce1c14b16bf3 100644 |
| --- 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; |
| } |
| |
| -- |
| 1.8.5.rc3 |
| |
