summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/s3c-hsotg.c
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-01-08 14:27:00 +0530
committerFelipe Balbi <balbi@ti.com>2013-01-10 12:41:56 +0200
commitcd76213eb57c505d3df6fa3134a6b3bb5394a90c (patch)
tree5867e91a1cb4af08d267e944abf78a8859c8c4a1 /drivers/usb/gadget/s3c-hsotg.c
parent924d2532ab1897b034fa5477aea661732b91d748 (diff)
downloadop-kernel-dev-cd76213eb57c505d3df6fa3134a6b3bb5394a90c.zip
op-kernel-dev-cd76213eb57c505d3df6fa3134a6b3bb5394a90c.tar.gz
usb: gadget: s3c-hsotg: Use devm_regulator_bulk_get API
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>
Diffstat (limited to 'drivers/usb/gadget/s3c-hsotg.c')
-rw-r--r--drivers/usb/gadget/s3c-hsotg.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index 141971d..833d85b 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -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);
@@ -3663,8 +3663,6 @@ err_ep_mem:
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);
@@ -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);
OpenPOWER on IntegriCloud