usb: otg: fsl: Start using struct usb_otg

Use struct usb_otg members with OTG specific functions instead
of usb_phy members.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: Li Yang <leoli@freescale.com>
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/usb/otg/otg_fsm.c b/drivers/usb/otg/otg_fsm.c
index 09117387d2a4..ade131a8ae5e 100644
--- a/drivers/usb/otg/otg_fsm.c
+++ b/drivers/usb/otg/otg_fsm.c
@@ -117,10 +117,10 @@ void otg_leave_state(struct otg_fsm *fsm, enum usb_otg_state old_state)
 int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)
 {
         state_changed = 1;
-        if (fsm->transceiver->state == new_state)
+        if (fsm->otg->phy->state == new_state)
                 return 0;
         VDBG("Set state: %s\n", otg_state_string(new_state));
-        otg_leave_state(fsm, fsm->transceiver->state);
+        otg_leave_state(fsm, fsm->otg->phy->state);
         switch (new_state) {
         case OTG_STATE_B_IDLE:
                 otg_drv_vbus(fsm, 0);
@@ -155,8 +155,8 @@ int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)
                 otg_loc_conn(fsm, 0);
                 otg_loc_sof(fsm, 1);
                 otg_set_protocol(fsm, PROTO_HOST);
-                usb_bus_start_enum(fsm->transceiver->host,
-                                fsm->transceiver->host->otg_port);
+                usb_bus_start_enum(fsm->otg->host,
+                                fsm->otg->host->otg_port);
                 break;
         case OTG_STATE_A_IDLE:
                 otg_drv_vbus(fsm, 0);
@@ -221,7 +221,7 @@ int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)
                 break;
         }
 
-        fsm->transceiver->state = new_state;
+        fsm->otg->phy->state = new_state;
         return 0;
 }
 
@@ -233,7 +233,7 @@ int otg_statemachine(struct otg_fsm *fsm)
 
         spin_lock_irqsave(&fsm->lock, flags);
 
-        state = fsm->transceiver->state;
+        state = fsm->otg->phy->state;
         state_changed = 0;
         /* State machine state change judgement */
 
@@ -248,7 +248,7 @@ int otg_statemachine(struct otg_fsm *fsm)
         case OTG_STATE_B_IDLE:
                 if (!fsm->id)
                         otg_set_state(fsm, OTG_STATE_A_IDLE);
-                else if (fsm->b_sess_vld && fsm->transceiver->gadget)
+                else if (fsm->b_sess_vld && fsm->otg->gadget)
                         otg_set_state(fsm, OTG_STATE_B_PERIPHERAL);
                 else if (fsm->b_bus_req && fsm->b_sess_end && fsm->b_se0_srp)
                         otg_set_state(fsm, OTG_STATE_B_SRP_INIT);
@@ -260,7 +260,7 @@ int otg_statemachine(struct otg_fsm *fsm)
         case OTG_STATE_B_PERIPHERAL:
                 if (!fsm->id || !fsm->b_sess_vld)
                         otg_set_state(fsm, OTG_STATE_B_IDLE);
-                else if (fsm->b_bus_req && fsm->transceiver->
+                else if (fsm->b_bus_req && fsm->otg->
                                 gadget->b_hnp_enable && fsm->a_bus_suspend)
                         otg_set_state(fsm, OTG_STATE_B_WAIT_ACON);
                 break;
@@ -302,7 +302,7 @@ int otg_statemachine(struct otg_fsm *fsm)
                 break;
         case OTG_STATE_A_HOST:
                 if ((!fsm->a_bus_req || fsm->a_suspend_req) &&
-                                fsm->transceiver->host->b_hnp_enable)
+                                fsm->otg->host->b_hnp_enable)
                         otg_set_state(fsm, OTG_STATE_A_SUSPEND);
                 else if (fsm->id || !fsm->b_conn || fsm->a_bus_drop)
                         otg_set_state(fsm, OTG_STATE_A_WAIT_BCON);
@@ -310,9 +310,9 @@ int otg_statemachine(struct otg_fsm *fsm)
                         otg_set_state(fsm, OTG_STATE_A_VBUS_ERR);
                 break;
         case OTG_STATE_A_SUSPEND:
-                if (!fsm->b_conn && fsm->transceiver->host->b_hnp_enable)
+                if (!fsm->b_conn && fsm->otg->host->b_hnp_enable)
                         otg_set_state(fsm, OTG_STATE_A_PERIPHERAL);
-                else if (!fsm->b_conn && !fsm->transceiver->host->b_hnp_enable)
+                else if (!fsm->b_conn && !fsm->otg->host->b_hnp_enable)
                         otg_set_state(fsm, OTG_STATE_A_WAIT_BCON);
                 else if (fsm->a_bus_req || fsm->b_bus_resume)
                         otg_set_state(fsm, OTG_STATE_A_HOST);