The existing variable gpio_chip already points to the gpiochip instance,
hence use it everywhere.

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
 drivers/gpio/gpio-rcar.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index c49522efa7b3bce4..e67d578ac07c45d5 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)
                goto err0;
        }
 
-       ret = gpiochip_irqchip_add(&p->gpio_chip, irq_chip, p->config.irq_base,
+       ret = gpiochip_irqchip_add(gpio_chip, irq_chip, p->config.irq_base,
                                   handle_level_irq, IRQ_TYPE_NONE);
        if (ret) {
                dev_err(dev, "cannot add irqchip\n");
@@ -431,7 +431,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
 
        /* warn in case of mismatch if irq base is specified */
        if (p->config.irq_base) {
-               ret = irq_find_mapping(p->gpio_chip.irqdomain, 0);
+               ret = irq_find_mapping(gpio_chip->irqdomain, 0);
                if (p->config.irq_base != ret)
                        dev_warn(dev, "irq base mismatch (%u/%u)\n",
                                 p->config.irq_base, ret);
@@ -447,7 +447,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
        return 0;
 
 err1:
-       gpiochip_remove(&p->gpio_chip);
+       gpiochip_remove(gpio_chip);
 err0:
        pm_runtime_put(dev);
        pm_runtime_disable(dev);
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to