diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-01-06 23:31:53 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2013-01-10 05:41:37 -0500 |
commit | 924d2532ab1897b034fa5477aea661732b91d748 (patch) | |
tree | f589fb6231be63f5a9332857336f7e9ab9be2513 /drivers/usb/gadget/s3c-hsudc.c | |
parent | d2aec37c3b7aa029ffb4ac5fa3d1ee3453d4d0a4 (diff) |
usb: gadget: s3c-hsudc: Use devm_regulator_bulk_get
devm_regulator_bulk_get is device managed and makes exit code
simpler.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/s3c-hsudc.c')
-rw-r--r-- | drivers/usb/gadget/s3c-hsudc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c index 52379b11f080..d2b8791bba28 100644 --- a/drivers/usb/gadget/s3c-hsudc.c +++ b/drivers/usb/gadget/s3c-hsudc.c | |||
@@ -1286,7 +1286,7 @@ static int s3c_hsudc_probe(struct platform_device *pdev) | |||
1286 | for (i = 0; i < ARRAY_SIZE(hsudc->supplies); i++) | 1286 | for (i = 0; i < ARRAY_SIZE(hsudc->supplies); i++) |
1287 | hsudc->supplies[i].supply = s3c_hsudc_supply_names[i]; | 1287 | hsudc->supplies[i].supply = s3c_hsudc_supply_names[i]; |
1288 | 1288 | ||
1289 | ret = regulator_bulk_get(dev, ARRAY_SIZE(hsudc->supplies), | 1289 | ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(hsudc->supplies), |
1290 | hsudc->supplies); | 1290 | hsudc->supplies); |
1291 | if (ret != 0) { | 1291 | if (ret != 0) { |
1292 | dev_err(dev, "failed to request supplies: %d\n", ret); | 1292 | dev_err(dev, "failed to request supplies: %d\n", ret); |
@@ -1367,7 +1367,6 @@ err_res: | |||
1367 | if (!IS_ERR_OR_NULL(hsudc->transceiver)) | 1367 | if (!IS_ERR_OR_NULL(hsudc->transceiver)) |
1368 | usb_put_phy(hsudc->transceiver); | 1368 | usb_put_phy(hsudc->transceiver); |
1369 | 1369 | ||
1370 | regulator_bulk_free(ARRAY_SIZE(hsudc->supplies), hsudc->supplies); | ||
1371 | err_supplies: | 1370 | err_supplies: |
1372 | return ret; | 1371 | return ret; |
1373 | } | 1372 | } |