diff options
author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2012-02-13 06:24:20 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-02-27 08:41:52 -0500 |
commit | 6e13c6505cdff9766d5268ffb8c972c1a2f996e6 (patch) | |
tree | e5e08928aaecfae70f5b2b904df1a30551af08d4 /drivers/usb/gadget/s3c-hsudc.c | |
parent | 136ced891ad2762dfe5ba476103e82ea2b9aff41 (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/s3c-hsudc.c')
-rw-r--r-- | drivers/usb/gadget/s3c-hsudc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c index e124bfa399f5..c2f3aa650584 100644 --- a/drivers/usb/gadget/s3c-hsudc.c +++ b/drivers/usb/gadget/s3c-hsudc.c | |||
@@ -1166,7 +1166,8 @@ static int s3c_hsudc_start(struct usb_gadget *gadget, | |||
1166 | 1166 | ||
1167 | /* connect to bus through transceiver */ | 1167 | /* connect to bus through transceiver */ |
1168 | if (hsudc->transceiver) { | 1168 | if (hsudc->transceiver) { |
1169 | ret = otg_set_peripheral(hsudc->transceiver, &hsudc->gadget); | 1169 | ret = otg_set_peripheral(hsudc->transceiver->otg, |
1170 | &hsudc->gadget); | ||
1170 | if (ret) { | 1171 | if (ret) { |
1171 | dev_err(hsudc->dev, "%s: can't bind to transceiver\n", | 1172 | dev_err(hsudc->dev, "%s: can't bind to transceiver\n", |
1172 | hsudc->gadget.name); | 1173 | hsudc->gadget.name); |
@@ -1214,7 +1215,7 @@ static int s3c_hsudc_stop(struct usb_gadget *gadget, | |||
1214 | spin_unlock_irqrestore(&hsudc->lock, flags); | 1215 | spin_unlock_irqrestore(&hsudc->lock, flags); |
1215 | 1216 | ||
1216 | if (hsudc->transceiver) | 1217 | if (hsudc->transceiver) |
1217 | (void) otg_set_peripheral(hsudc->transceiver, NULL); | 1218 | (void) otg_set_peripheral(hsudc->transceiver->otg, NULL); |
1218 | 1219 | ||
1219 | disable_irq(hsudc->irq); | 1220 | disable_irq(hsudc->irq); |
1220 | 1221 | ||