aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/otg/otg.c
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>2012-02-13 06:24:02 -0500
committerFelipe Balbi <balbi@ti.com>2012-02-13 06:34:36 -0500
commit8675381109b0eb1c948a423c2b35e3f4509cb25e (patch)
tree1b71e8d77114a75f5871569fd0784fe0b4c861e3 /drivers/usb/otg/otg.c
parent62aa2b537c6f5957afd98e29f96897419ed5ebab (diff)
usb: otg: Rename otg_transceiver to usb_phy
This is the first step in separating USB transceivers from USB OTG utilities. Includes fixes to IMX code 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> Acked-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/otg/otg.c')
-rw-r--r--drivers/usb/otg/otg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/otg/otg.c b/drivers/usb/otg/otg.c
index 307c27bc51eb..56c0f1781d8c 100644
--- a/drivers/usb/otg/otg.c
+++ b/drivers/usb/otg/otg.c
@@ -15,7 +15,7 @@
15 15
16#include <linux/usb/otg.h> 16#include <linux/usb/otg.h>
17 17
18static struct otg_transceiver *xceiv; 18static struct usb_phy *xceiv;
19 19
20/** 20/**
21 * otg_get_transceiver - find the (single) OTG transceiver 21 * otg_get_transceiver - find the (single) OTG transceiver
@@ -26,7 +26,7 @@ static struct otg_transceiver *xceiv;
26 * 26 *
27 * For use by USB host and peripheral drivers. 27 * For use by USB host and peripheral drivers.
28 */ 28 */
29struct otg_transceiver *otg_get_transceiver(void) 29struct usb_phy *otg_get_transceiver(void)
30{ 30{
31 if (xceiv) 31 if (xceiv)
32 get_device(xceiv->dev); 32 get_device(xceiv->dev);
@@ -42,7 +42,7 @@ EXPORT_SYMBOL(otg_get_transceiver);
42 * 42 *
43 * For use by USB host and peripheral drivers. 43 * For use by USB host and peripheral drivers.
44 */ 44 */
45void otg_put_transceiver(struct otg_transceiver *x) 45void otg_put_transceiver(struct usb_phy *x)
46{ 46{
47 if (x) 47 if (x)
48 put_device(x->dev); 48 put_device(x->dev);
@@ -57,7 +57,7 @@ EXPORT_SYMBOL(otg_put_transceiver);
57 * coordinate the activities of drivers for host and peripheral 57 * coordinate the activities of drivers for host and peripheral
58 * controllers, and in some cases for VBUS current regulation. 58 * controllers, and in some cases for VBUS current regulation.
59 */ 59 */
60int otg_set_transceiver(struct otg_transceiver *x) 60int otg_set_transceiver(struct usb_phy *x)
61{ 61{
62 if (xceiv && x) 62 if (xceiv && x)
63 return -EBUSY; 63 return -EBUSY;