]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
pinctrl: samsung: Use devres version of gpiochip_add_data
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Wed, 22 Mar 2017 17:15:35 +0000 (17:15 +0000)
committerKrzysztof Kozlowski <krzk@kernel.org>
Thu, 23 Mar 2017 19:13:19 +0000 (21:13 +0200)
Use devm_gpiochip_add_data to simplify the error path in
samsung_gpiolib_register.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
drivers/pinctrl/samsung/pinctrl-samsung.c

index 5d53370723505dbf46c6fc403dc36ec74d92c93c..934fc3b6b5aa82c3cf51d111c1f9137e48c38250 100644 (file)
@@ -936,20 +936,15 @@ static int samsung_gpiolib_register(struct platform_device *pdev,
                gc->of_node = bank->of_node;
                gc->label = bank->name;
 
-               ret = gpiochip_add_data(gc, bank);
+               ret = devm_gpiochip_add_data(&pdev->dev, gc, bank);
                if (ret) {
                        dev_err(&pdev->dev, "failed to register gpio_chip %s, error code: %d\n",
                                                        gc->label, ret);
-                       goto fail;
+                       return ret;
                }
        }
 
        return 0;
-
-fail:
-       for (--i, --bank; i >= 0; --i, --bank)
-               gpiochip_remove(&bank->gpio_chip);
-       return ret;
 }
 
 /* retrieve the soc specific data */