Skip to content

Commit

Permalink
usb: gadget: s3c-hsotg: Use devm_regulator_bulk_get API
Browse files Browse the repository at this point in the history
devm_regulator_bulk_get is device managed and saves some cleanup
and exit code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Sachin Kamat authored and Felipe Balbi committed Jan 10, 2013
1 parent 924d253 commit cd76213
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/usb/gadget/s3c-hsotg.c
Original file line number Diff line number Diff line change
Expand Up @@ -3573,7 +3573,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
for (i = 0; i < ARRAY_SIZE(hsotg->supplies); i++)
hsotg->supplies[i].supply = s3c_hsotg_supply_names[i];

ret = regulator_bulk_get(dev, ARRAY_SIZE(hsotg->supplies),
ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(hsotg->supplies),
hsotg->supplies);
if (ret) {
dev_err(dev, "failed to request supplies: %d\n", ret);
Expand Down Expand Up @@ -3663,8 +3663,6 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
kfree(eps);
err_supplies:
s3c_hsotg_phy_disable(hsotg);
regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);

err_clk:
clk_disable_unprepare(hsotg->clk);

Expand All @@ -3689,7 +3687,6 @@ static int s3c_hsotg_remove(struct platform_device *pdev)
}

s3c_hsotg_phy_disable(hsotg);
regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);

clk_disable_unprepare(hsotg->clk);

Expand Down

0 comments on commit cd76213

Please sign in to comment.