From: Hao Wu <hao.wu@xxxxxxxxx>
This patch removes unnecessary and duplicated vbus control code
from the OTG state machine.
Signed-off-by: Hao Wu <hao.wu@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
---
drivers/usb/otg/langwell_otg.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/otg/langwell_otg.c b/drivers/usb/otg/langwell_otg.c
index d808360..0811fb7 100644
--- a/drivers/usb/otg/langwell_otg.c
+++ b/drivers/usb/otg/langwell_otg.c
@@ -880,7 +880,6 @@ static void langwell_otg_work(struct work_struct *work)
lnw->otg.default_a = 1;
lnw->hsm.a_srp_det = 0;
langwell_otg_chrg_vbus(0);
- langwell_otg_drv_vbus(0);
set_host_mode();
langwell_otg_phy_low_power(1);
lnw->otg.state = OTG_STATE_A_IDLE;
@@ -954,7 +953,6 @@ static void langwell_otg_work(struct work_struct *work)
lnw->otg.default_a = 1;
lnw->hsm.a_srp_det = 0;
- langwell_otg_drv_vbus(0);
langwell_otg_chrg_vbus(0);
if (lnw->client_ops) {
@@ -1012,7 +1010,6 @@ static void langwell_otg_work(struct work_struct *work)
lnw->otg.default_a = 1;
lnw->hsm.a_srp_det = 0;
- langwell_otg_drv_vbus(0);
langwell_otg_chrg_vbus(0);
langwell_otg_HAAR(0);
@@ -1079,7 +1076,6 @@ static void langwell_otg_work(struct work_struct *work)
lnw->otg.default_a = 1;
lnw->hsm.a_srp_det = 0;
- langwell_otg_drv_vbus(0);
langwell_otg_chrg_vbus(0);
if (lnw->host_ops)
lnw->host_ops->remove(lnw->pdev);
@@ -1131,7 +1127,6 @@ static void langwell_otg_work(struct work_struct *work)
lnw->otg.default_a = 0;
lnw->hsm.b_bus_req = 0;
lnw->hsm.vbus_srp_up = 0;
- langwell_otg_drv_vbus(0);
langwell_otg_chrg_vbus(0);
set_client_mode();
langwell_otg_phy_low_power(1);
@@ -1553,7 +1548,6 @@ static void langwell_otg_work(struct work_struct *work)
lnw->otg.state = OTG_STATE_A_WAIT_VRISE;
} else if (!lnw->hsm.a_sess_vld) {
lnw->hsm.a_srp_det = 0;
- langwell_otg_drv_vbus(0);
set_host_mode();
langwell_otg_phy_low_power(1);
lnw->otg.state = OTG_STATE_A_IDLE;
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
