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>

3 files changed, 9 insertions, 9 deletions

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 7e9be74dba4d..88bf453e33da 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1961,7 +1961,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         if (is_host_enabled(musb)) {
                 struct usb_hcd  *hcd = musb_to_hcd(musb);
 
-                otg_set_host(musb->xceiv, &hcd->self);
+                otg_set_host(musb->xceiv->otg, &hcd->self);
 
                 if (is_otg_enabled(musb))
                         hcd->self.otg_port = 1;
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 3a1793663d91..caeaf9f96f73 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1624,7 +1624,7 @@ static int musb_gadget_wakeup(struct usb_gadget *gadget)
                 }
 
                 spin_unlock_irqrestore(&musb->lock, flags);
-                otg_start_srp(musb->xceiv);
+                otg_start_srp(musb->xceiv->otg);
                 spin_lock_irqsave(&musb->lock, flags);
 
                 /* Block idling for at least 1s */
@@ -1915,7 +1915,7 @@ static int musb_gadget_start(struct usb_gadget *g,
         spin_lock_irqsave(&musb->lock, flags);
         musb->is_active = 1;
 
-        otg_set_peripheral(musb->xceiv, &musb->g);
+        otg_set_peripheral(otg, &musb->g);
         musb->xceiv->state = OTG_STATE_B_IDLE;
 
         /*
@@ -1947,7 +1947,7 @@ static int musb_gadget_start(struct usb_gadget *g,
 
                 if ((musb->xceiv->last_event == USB_EVENT_ID)
                                         && otg->set_vbus)
-                        otg_set_vbus(musb->xceiv, 1);
+                        otg_set_vbus(otg, 1);
 
                 hcd->self.uses_pio_for_control = 1;
         }
@@ -2029,7 +2029,7 @@ static int musb_gadget_stop(struct usb_gadget *g,
 
         musb->xceiv->state = OTG_STATE_UNDEFINED;
         stop_activity(musb, driver);
-        otg_set_peripheral(musb->xceiv, NULL);
+        otg_set_peripheral(musb->xceiv->otg, NULL);
 
         dev_dbg(musb->controller, "unregistering driver %s\n", driver->function);
 
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 96a3d3763cc4..d8df60a9fc2a 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -164,8 +164,8 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
                                 }
                         }
 
-                        if (ret && musb->xceiv->set_vbus)
-                                otg_set_vbus(musb->xceiv, 1);
+                        if (ret && otg->set_vbus)
+                                otg_set_vbus(otg, 1);
                 } else {
                         musb->is_active = 1;
                         otg->default_a = 1;
@@ -270,8 +270,8 @@ static void musb_otg_notifier_work(struct work_struct *data_notifier_work)
                         }
 
                 if (data->interface_type == MUSB_INTERFACE_UTMI) {
-                        if (musb->xceiv->set_vbus)
-                                otg_set_vbus(musb->xceiv, 0);
+                        if (musb->xceiv->otg->set_vbus)
+                                otg_set_vbus(musb->xceiv->otg, 0);
                 }
                 usb_phy_shutdown(musb->xceiv);
                 break;