]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
gpio: em: use the managed version of gpiochip_add_data()
authorBartosz Golaszewski <bgolaszewski@baylibre.com>
Tue, 28 May 2019 15:46:01 +0000 (17:46 +0200)
committerBartosz Golaszewski <bgolaszewski@baylibre.com>
Fri, 31 May 2019 07:32:39 +0000 (09:32 +0200)
Use the managed variant of gpiochip_add_data() and remove the call to
gpiochip_remove().

Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
drivers/gpio/gpio-em.c

index 40f8c38bec1c24af1a80f63829fd6d0f3e52b4e2..299101d25fa890d388a3d41237ba88825a0dc6ee 100644 (file)
@@ -359,7 +359,7 @@ static int em_gio_probe(struct platform_device *pdev)
                goto err1;
        }
 
-       ret = gpiochip_add_data(gpio_chip, p);
+       ret = devm_gpiochip_add_data(&pdev->dev, gpio_chip, p);
        if (ret) {
                dev_err(&pdev->dev, "failed to add GPIO controller\n");
                goto err1;
@@ -376,8 +376,6 @@ static int em_gio_remove(struct platform_device *pdev)
 {
        struct em_gio_priv *p = platform_get_drvdata(pdev);
 
-       gpiochip_remove(&p->gpio_chip);
-
        irq_domain_remove(p->irq_domain);
        return 0;
 }