aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/s3c-hsudc.c
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>2012-02-13 06:24:18 -0500
committerFelipe Balbi <balbi@ti.com>2012-02-27 08:41:48 -0500
commitb96d3b08365f5a9603f50f3aadca6012f7eaffa1 (patch)
treefceda0fed3b03c96353dc8cd21a965ba986e3e09 /drivers/usb/gadget/s3c-hsudc.c
parentb1c711d629358576e8896a18e74cd5f4d811d7f7 (diff)
usb: Convert all users to new usb_phy
Use the new usb_phy_* functions with transceiver operations instead of the old otg functions. Includes fixes from Sascha Hauer. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Pavankumar Kondeti <pkondeti@codeaurora.org> Acked-by: Li Yang <leoli@freescale.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Reviewed-by: Marek Vasut <marek.vasut@gmail.com> 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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index dea475a61fd3..e124bfa399f5 100644
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -1243,7 +1243,7 @@ static int s3c_hsudc_vbus_draw(struct usb_gadget *gadget, unsigned mA)
1243 return -ENODEV; 1243 return -ENODEV;
1244 1244
1245 if (hsudc->transceiver) 1245 if (hsudc->transceiver)
1246 return otg_set_power(hsudc->transceiver, mA); 1246 return usb_phy_set_power(hsudc->transceiver, mA);
1247 1247
1248 return -EOPNOTSUPP; 1248 return -EOPNOTSUPP;
1249} 1249}
@@ -1275,7 +1275,7 @@ static int __devinit s3c_hsudc_probe(struct platform_device *pdev)
1275 hsudc->dev = dev; 1275 hsudc->dev = dev;
1276 hsudc->pd = pdev->dev.platform_data; 1276 hsudc->pd = pdev->dev.platform_data;
1277 1277
1278 hsudc->transceiver = otg_get_transceiver(); 1278 hsudc->transceiver = usb_get_transceiver();
1279 1279
1280 for (i = 0; i < ARRAY_SIZE(hsudc->supplies); i++) 1280 for (i = 0; i < ARRAY_SIZE(hsudc->supplies); i++)
1281 hsudc->supplies[i].supply = s3c_hsudc_supply_names[i]; 1281 hsudc->supplies[i].supply = s3c_hsudc_supply_names[i];
@@ -1377,7 +1377,7 @@ err_remap:
1377 release_mem_region(res->start, resource_size(res)); 1377 release_mem_region(res->start, resource_size(res));
1378err_res: 1378err_res:
1379 if (hsudc->transceiver) 1379 if (hsudc->transceiver)
1380 otg_put_transceiver(hsudc->transceiver); 1380 usb_put_transceiver(hsudc->transceiver);
1381 1381
1382 regulator_bulk_free(ARRAY_SIZE(hsudc->supplies), hsudc->supplies); 1382 regulator_bulk_free(ARRAY_SIZE(hsudc->supplies), hsudc->supplies);
1383err_supplies: 1383err_supplies: