Browse Source

pinctrl: samsung: Use devres version of gpiochip_add_data

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>
Charles Keepax 8 years ago
parent
commit
f69ae4f58a
1 changed files with 2 additions and 7 deletions
  1. 2 7
      drivers/pinctrl/samsung/pinctrl-samsung.c

+ 2 - 7
drivers/pinctrl/samsung/pinctrl-samsung.c

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