aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/ci13xxx_udc.c
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>2012-02-13 06:24:20 -0500
committerFelipe Balbi <balbi@ti.com>2012-02-27 08:41:52 -0500
commit6e13c6505cdff9766d5268ffb8c972c1a2f996e6 (patch)
treee5e08928aaecfae70f5b2b904df1a30551af08d4 /drivers/usb/gadget/ci13xxx_udc.c
parent136ced891ad2762dfe5ba476103e82ea2b9aff41 (diff)
usb: otg: Convert all users to pass struct usb_otg for OTG functions
This changes the otg functions so that they receive struct otg instead of struct usb_phy as parameter and converts all users of these functions to pass the otg member of their usb_phy. Includes fixes to IMX code from Sascha Hauer. [ balbi@ti.com : fixed a compile warning on ehci-mv.c ] Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Igor Grinberg <grinberg@compulab.co.il> 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.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c
index 68ad160f2589..b27cb0b0077b 100644
--- a/drivers/usb/gadget/ci13xxx_udc.c
+++ b/drivers/usb/gadget/ci13xxx_udc.c
@@ -2928,7 +2928,8 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev,
2928 goto unreg_device; 2928 goto unreg_device;
2929 2929
2930 if (udc->transceiver) { 2930 if (udc->transceiver) {
2931 retval = otg_set_peripheral(udc->transceiver, &udc->gadget); 2931 retval = otg_set_peripheral(udc->transceiver->otg,
2932 &udc->gadget);
2932 if (retval) 2933 if (retval)
2933 goto remove_dbg; 2934 goto remove_dbg;
2934 } 2935 }
@@ -2945,7 +2946,7 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev,
2945 2946
2946remove_trans: 2947remove_trans:
2947 if (udc->transceiver) { 2948 if (udc->transceiver) {
2948 otg_set_peripheral(udc->transceiver, &udc->gadget); 2949 otg_set_peripheral(udc->transceiver->otg, &udc->gadget);
2949 usb_put_transceiver(udc->transceiver); 2950 usb_put_transceiver(udc->transceiver);
2950 } 2951 }
2951 2952
@@ -2981,7 +2982,7 @@ static void udc_remove(void)
2981 usb_del_gadget_udc(&udc->gadget); 2982 usb_del_gadget_udc(&udc->gadget);
2982 2983
2983 if (udc->transceiver) { 2984 if (udc->transceiver) {
2984 otg_set_peripheral(udc->transceiver, &udc->gadget); 2985 otg_set_peripheral(udc->transceiver->otg, &udc->gadget);
2985 usb_put_transceiver(udc->transceiver); 2986 usb_put_transceiver(udc->transceiver);
2986 } 2987 }
2987#ifdef CONFIG_USB_GADGET_DEBUG_FILES 2988#ifdef CONFIG_USB_GADGET_DEBUG_FILES