aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/nomadik/pinctrl-abx500.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pinctrl/nomadik/pinctrl-abx500.c')
-rw-r--r--drivers/pinctrl/nomadik/pinctrl-abx500.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c
index a53a689a2bfa..7df34b70e8b6 100644
--- a/drivers/pinctrl/nomadik/pinctrl-abx500.c
+++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c
@@ -1298,10 +1298,7 @@ static int abx500_gpio_probe(struct platform_device *pdev)
1298 return 0; 1298 return 0;
1299 1299
1300out_rem_chip: 1300out_rem_chip:
1301 err = gpiochip_remove(&pct->chip); 1301 gpiochip_remove(&pct->chip);
1302 if (err)
1303 dev_info(&pdev->dev, "failed to remove gpiochip\n");
1304
1305 return ret; 1302 return ret;
1306} 1303}
1307 1304
@@ -1312,15 +1309,8 @@ out_rem_chip:
1312static int abx500_gpio_remove(struct platform_device *pdev) 1309static int abx500_gpio_remove(struct platform_device *pdev)
1313{ 1310{
1314 struct abx500_pinctrl *pct = platform_get_drvdata(pdev); 1311 struct abx500_pinctrl *pct = platform_get_drvdata(pdev);
1315 int ret;
1316
1317 ret = gpiochip_remove(&pct->chip);
1318 if (ret < 0) {
1319 dev_err(pct->dev, "unable to remove gpiochip: %d\n",
1320 ret);
1321 return ret;
1322 }
1323 1312
1313 gpiochip_remove(&pct->chip);
1324 return 0; 1314 return 0;
1325} 1315}
1326 1316