summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-07-05 23:12:49 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-15 21:49:53 +0100
commit5febb3c9d52c65686a8e473a31f15137852f4b5e (patch)
tree6d291f4989841b875bab4c6004dd7bd32c3870f4
parent8fa25eda86b1a149fd19b5ce80d8cf7b6c8fb566 (diff)
downloadtalos-obmc-linux-5febb3c9d52c65686a8e473a31f15137852f4b5e.tar.gz
talos-obmc-linux-5febb3c9d52c65686a8e473a31f15137852f4b5e.zip
regulator: s5m8767: Properly handle gpio_request failure
Convert to devm_gpio_request to save a few error handling code. This patch properly handle the gpio_request failure, we should return error when gpio_request fails rather than just show warning. I think one of the reason we got -EBUSY is because current code does not free gpios in s5m8767_pmic_remove(). So it got -EBUSY when reload the module. Yest another reason is in current code if gpio_request() returns error, the rest of the code still calls gpio_direction_output to config buck_gpios and buck_ds gpios. This looks wrong to me. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/regulator/s5m8767.c49
1 files changed, 24 insertions, 25 deletions
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 1ad9c3c0da8d..102287fa7ecb 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -620,20 +620,21 @@ static __devinit int s5m8767_pmic_probe(struct platform_device *pdev)
if (gpio_is_valid(pdata->buck_gpios[0]) &&
gpio_is_valid(pdata->buck_gpios[1]) &&
gpio_is_valid(pdata->buck_gpios[2])) {
- ret = gpio_request(pdata->buck_gpios[0], "S5M8767 SET1");
- if (ret == -EBUSY)
- dev_warn(&pdev->dev, "Duplicated gpio request"
- " for SET1\n");
-
- ret = gpio_request(pdata->buck_gpios[1], "S5M8767 SET2");
- if (ret == -EBUSY)
- dev_warn(&pdev->dev, "Duplicated gpio request"
- " for SET2\n");
-
- ret = gpio_request(pdata->buck_gpios[2], "S5M8767 SET3");
- if (ret == -EBUSY)
- dev_warn(&pdev->dev, "Duplicated gpio request"
- " for SET3\n");
+ ret = devm_gpio_request(&pdev->dev, pdata->buck_gpios[0],
+ "S5M8767 SET1");
+ if (ret)
+ return ret;
+
+ ret = devm_gpio_request(&pdev->dev, pdata->buck_gpios[1],
+ "S5M8767 SET2");
+ if (ret)
+ return ret;
+
+ ret = devm_gpio_request(&pdev->dev, pdata->buck_gpios[2],
+ "S5M8767 SET3");
+ if (ret)
+ return ret;
+
/* SET1 GPIO */
gpio_direction_output(pdata->buck_gpios[0],
(s5m8767->buck_gpioindex >> 2) & 0x1);
@@ -643,25 +644,23 @@ static __devinit int s5m8767_pmic_probe(struct platform_device *pdev)
/* SET3 GPIO */
gpio_direction_output(pdata->buck_gpios[2],
(s5m8767->buck_gpioindex >> 0) & 0x1);
- ret = 0;
-
} else {
dev_err(&pdev->dev, "GPIO NOT VALID\n");
ret = -EINVAL;
return ret;
}
- ret = gpio_request(pdata->buck_ds[0], "S5M8767 DS2");
- if (ret == -EBUSY)
- dev_warn(&pdev->dev, "Duplicated gpio request for DS2\n");
+ ret = devm_gpio_request(&pdev->dev, pdata->buck_ds[0], "S5M8767 DS2");
+ if (ret)
+ return ret;
- ret = gpio_request(pdata->buck_ds[1], "S5M8767 DS3");
- if (ret == -EBUSY)
- dev_warn(&pdev->dev, "Duplicated gpio request for DS3\n");
+ ret = devm_gpio_request(&pdev->dev, pdata->buck_ds[1], "S5M8767 DS3");
+ if (ret)
+ return ret;
- ret = gpio_request(pdata->buck_ds[2], "S5M8767 DS4");
- if (ret == -EBUSY)
- dev_warn(&pdev->dev, "Duplicated gpio request for DS4\n");
+ ret = devm_gpio_request(&pdev->dev, pdata->buck_ds[2], "S5M8767 DS4");
+ if (ret)
+ return ret;
/* DS2 GPIO */
gpio_direction_output(pdata->buck_ds[0], 0x0);
OpenPOWER on IntegriCloud