iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: wm831x-dcdc: Convert to devm_gpio_request_one()

Browse Source 
Saves code in the unwind path.

Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Mark Brown 2013-08-31 11:42:46 +01:00
parent 272b98c645
commit 1aa20d27b4
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/regulator/wm831x-dcdc.c
View File

@ -387,8 +387,9 @@ static struct regulator_ops wm831x_buckv_ops = {
* Set up DVS control. We just log errors since we can still run * Set up DVS control. We just log errors since we can still run
* (with reduced performance) if we fail. * (with reduced performance) if we fail.
*/ */
static void wm831x_buckv_dvs_init(struct wm831x_dcdc *dcdc, static void wm831x_buckv_dvs_init(struct platform_device *pdev,
struct wm831x_buckv_pdata *pdata) struct wm831x_dcdc *dcdc,
struct wm831x_buckv_pdata *pdata)
{ {
struct wm831x *wm831x = dcdc->wm831x; struct wm831x *wm831x = dcdc->wm831x;
int ret; int ret;
@ -402,9 +403,9 @@ static void wm831x_buckv_dvs_init(struct wm831x_dcdc *dcdc,
*/ */
dcdc->dvs_gpio_state = pdata->dvs_init_state; dcdc->dvs_gpio_state = pdata->dvs_init_state;
ret = gpio_request_one(pdata->dvs_gpio, ret = devm_gpio_request_one(&pdev->dev, pdata->dvs_gpio,
dcdc->dvs_gpio_state ? GPIOF_INIT_HIGH : 0, dcdc->dvs_gpio_state ? GPIOF_INIT_HIGH : 0,
"DCDC DVS"); "DCDC DVS");
if (ret < 0) { if (ret < 0) {
dev_err(wm831x->dev, "Failed to get %s DVS GPIO: %d\n", dev_err(wm831x->dev, "Failed to get %s DVS GPIO: %d\n",
dcdc->name, ret); dcdc->name, ret);
@ -513,7 +514,8 @@ static int wm831x_buckv_probe(struct platform_device *pdev)
dcdc->dvs_vsel = ret & WM831X_DC1_DVS_VSEL_MASK; dcdc->dvs_vsel = ret & WM831X_DC1_DVS_VSEL_MASK;
if (pdata && pdata->dcdc[id]) if (pdata && pdata->dcdc[id])
wm831x_buckv_dvs_init(dcdc, pdata->dcdc[id]->driver_data); wm831x_buckv_dvs_init(pdev, dcdc,
pdata->dcdc[id]->driver_data);
config.dev = pdev->dev.parent; config.dev = pdev->dev.parent;
if (pdata) if (pdata)
@ -557,8 +559,6 @@ err_uv:
err_regulator: err_regulator:
regulator_unregister(dcdc->regulator); regulator_unregister(dcdc->regulator);
err: err:
if (dcdc->dvs_gpio)
gpio_free(dcdc->dvs_gpio);
return ret; return ret;
} }
@ -572,8 +572,6 @@ static int wm831x_buckv_remove(struct platform_device *pdev)
free_irq(wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV")), free_irq(wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV")),
dcdc); dcdc);
regulator_unregister(dcdc->regulator); regulator_unregister(dcdc->regulator);
if (dcdc->dvs_gpio)
gpio_free(dcdc->dvs_gpio);
return 0; return 0;
} }