diff options
| author | Anton Tikhomirov <av.tikhomirov@samsung.com> | 2013-10-03 12:42:04 +0900 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-10-04 09:44:48 -0500 |
| commit | cff4dab4cb95d394e9fd73f668326dac06e57b10 (patch) | |
| tree | 0db13178d017c2a3bb04d0c4716a712f07208c47 | |
| parent | 3294908bc0f178bfd67971fdb4432f3d4e50921e (diff) | |
| download | op-kernel-dev-cff4dab4cb95d394e9fd73f668326dac06e57b10.zip op-kernel-dev-cff4dab4cb95d394e9fd73f668326dac06e57b10.tar.gz | |
usb: phy: Rename OTG FSM informative variables
Mark informative variables with suffix '_inf' to distinguish
them from other non-informative variables with the same name.
If such non-informative varialbes were missed, they are created.
Signed-off-by: Anton Tikhomirov <av.tikhomirov@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/phy/phy-fsl-usb.c | 2 | ||||
| -rw-r--r-- | drivers/usb/phy/phy-fsm-usb.c | 6 | ||||
| -rw-r--r-- | drivers/usb/phy/phy-fsm-usb.h | 14 |
3 files changed, 13 insertions, 9 deletions
diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c index 6495861..d13ccd5 100644 --- a/drivers/usb/phy/phy-fsl-usb.c +++ b/drivers/usb/phy/phy-fsl-usb.c @@ -1113,7 +1113,7 @@ static long fsl_otg_ioctl(struct file *file, unsigned int cmd, break; case SET_A_SUSPEND_REQ: - fsl_otg_dev->fsm.a_suspend_req = arg; + fsl_otg_dev->fsm.a_suspend_req_inf = arg; break; case SET_A_BUS_DROP: diff --git a/drivers/usb/phy/phy-fsm-usb.c b/drivers/usb/phy/phy-fsm-usb.c index 5e899ed..cb0367c 100644 --- a/drivers/usb/phy/phy-fsm-usb.c +++ b/drivers/usb/phy/phy-fsm-usb.c @@ -99,7 +99,7 @@ void otg_leave_state(struct otg_fsm *fsm, enum usb_otg_state old_state) case OTG_STATE_A_SUSPEND: otg_del_timer(fsm, A_AIDL_BDIS); fsm->a_aidl_bdis_tmout = 0; - fsm->a_suspend_req = 0; + fsm->a_suspend_req_inf = 0; break; case OTG_STATE_A_PERIPHERAL: otg_del_timer(fsm, A_BIDL_ADIS); @@ -192,7 +192,7 @@ int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state) * When HNP is triggered while a_bus_req = 0, a_host will * suspend too fast to complete a_set_b_hnp_en */ - if (!fsm->a_bus_req || fsm->a_suspend_req) + if (!fsm->a_bus_req || fsm->a_suspend_req_inf) otg_add_timer(fsm, A_WAIT_ENUM); break; case OTG_STATE_A_SUSPEND: @@ -307,7 +307,7 @@ int otg_statemachine(struct otg_fsm *fsm) otg_set_state(fsm, OTG_STATE_A_WAIT_VFALL); break; case OTG_STATE_A_HOST: - if ((!fsm->a_bus_req || fsm->a_suspend_req) && + if ((!fsm->a_bus_req || fsm->a_suspend_req_inf) && 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) diff --git a/drivers/usb/phy/phy-fsm-usb.h b/drivers/usb/phy/phy-fsm-usb.h index a74e14a..4049e5c 100644 --- a/drivers/usb/phy/phy-fsm-usb.h +++ b/drivers/usb/phy/phy-fsm-usb.h @@ -54,9 +54,12 @@ enum otg_fsm_timer { /* OTG state machine according to the OTG spec */ struct otg_fsm { /* Input */ + int a_bus_drop; + int a_bus_req; int a_bus_resume; int a_bus_suspend; int a_conn; + int b_bus_req; int a_sess_vld; int a_srp_det; int a_vbus_vld; @@ -72,6 +75,7 @@ struct otg_fsm { int a_set_b_hnp_en; int b_srp_done; int b_hnp_enable; + int a_clr_err; /* Timeout indicator for timers */ int a_wait_vrise_tmout; @@ -82,11 +86,11 @@ struct otg_fsm { int a_bidl_adis_tmout; /* Informative variables */ - int a_bus_drop; - int a_bus_req; - int a_clr_err; - int a_suspend_req; - int b_bus_req; + int a_bus_drop_inf; + int a_bus_req_inf; + int a_clr_err_inf; + int a_suspend_req_inf; + int b_bus_req_inf; /* Output */ int drv_vbus; |
