diff options
author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2012-02-13 06:24:18 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-02-27 08:41:48 -0500 |
commit | b96d3b08365f5a9603f50f3aadca6012f7eaffa1 (patch) | |
tree | fceda0fed3b03c96353dc8cd21a965ba986e3e09 /drivers/usb/gadget/ci13xxx_udc.c | |
parent | b1c711d629358576e8896a18e74cd5f4d811d7f7 (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/ci13xxx_udc.c')
-rw-r--r-- | drivers/usb/gadget/ci13xxx_udc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c index 27e313718422..68ad160f2589 100644 --- a/drivers/usb/gadget/ci13xxx_udc.c +++ b/drivers/usb/gadget/ci13xxx_udc.c | |||
@@ -2537,7 +2537,7 @@ static int ci13xxx_vbus_draw(struct usb_gadget *_gadget, unsigned mA) | |||
2537 | struct ci13xxx *udc = container_of(_gadget, struct ci13xxx, gadget); | 2537 | struct ci13xxx *udc = container_of(_gadget, struct ci13xxx, gadget); |
2538 | 2538 | ||
2539 | if (udc->transceiver) | 2539 | if (udc->transceiver) |
2540 | return otg_set_power(udc->transceiver, mA); | 2540 | return usb_phy_set_power(udc->transceiver, mA); |
2541 | return -ENOTSUPP; | 2541 | return -ENOTSUPP; |
2542 | } | 2542 | } |
2543 | 2543 | ||
@@ -2900,7 +2900,7 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev, | |||
2900 | if (retval < 0) | 2900 | if (retval < 0) |
2901 | goto free_udc; | 2901 | goto free_udc; |
2902 | 2902 | ||
2903 | udc->transceiver = otg_get_transceiver(); | 2903 | udc->transceiver = usb_get_transceiver(); |
2904 | 2904 | ||
2905 | if (udc->udc_driver->flags & CI13XXX_REQUIRE_TRANSCEIVER) { | 2905 | if (udc->udc_driver->flags & CI13XXX_REQUIRE_TRANSCEIVER) { |
2906 | if (udc->transceiver == NULL) { | 2906 | if (udc->transceiver == NULL) { |
@@ -2946,7 +2946,7 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev, | |||
2946 | remove_trans: | 2946 | remove_trans: |
2947 | if (udc->transceiver) { | 2947 | if (udc->transceiver) { |
2948 | otg_set_peripheral(udc->transceiver, &udc->gadget); | 2948 | otg_set_peripheral(udc->transceiver, &udc->gadget); |
2949 | otg_put_transceiver(udc->transceiver); | 2949 | usb_put_transceiver(udc->transceiver); |
2950 | } | 2950 | } |
2951 | 2951 | ||
2952 | err("error = %i", retval); | 2952 | err("error = %i", retval); |
@@ -2958,7 +2958,7 @@ unreg_device: | |||
2958 | device_unregister(&udc->gadget.dev); | 2958 | device_unregister(&udc->gadget.dev); |
2959 | put_transceiver: | 2959 | put_transceiver: |
2960 | if (udc->transceiver) | 2960 | if (udc->transceiver) |
2961 | otg_put_transceiver(udc->transceiver); | 2961 | usb_put_transceiver(udc->transceiver); |
2962 | free_udc: | 2962 | free_udc: |
2963 | kfree(udc); | 2963 | kfree(udc); |
2964 | _udc = NULL; | 2964 | _udc = NULL; |
@@ -2982,7 +2982,7 @@ static void udc_remove(void) | |||
2982 | 2982 | ||
2983 | if (udc->transceiver) { | 2983 | if (udc->transceiver) { |
2984 | otg_set_peripheral(udc->transceiver, &udc->gadget); | 2984 | otg_set_peripheral(udc->transceiver, &udc->gadget); |
2985 | otg_put_transceiver(udc->transceiver); | 2985 | usb_put_transceiver(udc->transceiver); |
2986 | } | 2986 | } |
2987 | #ifdef CONFIG_USB_GADGET_DEBUG_FILES | 2987 | #ifdef CONFIG_USB_GADGET_DEBUG_FILES |
2988 | dbg_remove_files(&udc->gadget.dev); | 2988 | dbg_remove_files(&udc->gadget.dev); |