aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2015-03-18 14:41:07 -0400
committerLinus Walleij <linus.walleij@linaro.org>2015-03-26 05:17:55 -0400
commit4d84b9e4957589730d13d210e9e94bb5f5996ba3 (patch)
tree96d8f45197d91857c5a08e42fa0737fe0674de25
parente189ca56d91bbf1d3fe2f88ab6858bf919d42adf (diff)
gpio: rcar: Use local variable gpio_chip in gpio_rcar_probe()
The existing variable gpio_chip already points to the gpiochip instance, hence use it everywhere. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpio-rcar.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index c49522efa7b3..e67d578ac07c 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -413,7 +413,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
413 goto err0; 413 goto err0;
414 } 414 }
415 415
416 ret = gpiochip_irqchip_add(&p->gpio_chip, irq_chip, p->config.irq_base, 416 ret = gpiochip_irqchip_add(gpio_chip, irq_chip, p->config.irq_base,
417 handle_level_irq, IRQ_TYPE_NONE); 417 handle_level_irq, IRQ_TYPE_NONE);
418 if (ret) { 418 if (ret) {
419 dev_err(dev, "cannot add irqchip\n"); 419 dev_err(dev, "cannot add irqchip\n");
@@ -431,7 +431,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
431 431
432 /* warn in case of mismatch if irq base is specified */ 432 /* warn in case of mismatch if irq base is specified */
433 if (p->config.irq_base) { 433 if (p->config.irq_base) {
434 ret = irq_find_mapping(p->gpio_chip.irqdomain, 0); 434 ret = irq_find_mapping(gpio_chip->irqdomain, 0);
435 if (p->config.irq_base != ret) 435 if (p->config.irq_base != ret)
436 dev_warn(dev, "irq base mismatch (%u/%u)\n", 436 dev_warn(dev, "irq base mismatch (%u/%u)\n",
437 p->config.irq_base, ret); 437 p->config.irq_base, ret);
@@ -447,7 +447,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
447 return 0; 447 return 0;
448 448
449err1: 449err1:
450 gpiochip_remove(&p->gpio_chip); 450 gpiochip_remove(gpio_chip);
451err0: 451err0:
452 pm_runtime_put(dev); 452 pm_runtime_put(dev);
453 pm_runtime_disable(dev); 453 pm_runtime_disable(dev);