From 4acc349dfd9a20a978ae99efd6a03db0d51428a9 Mon Sep 17 00:00:00 2001 From: Li Jun Date: Fri, 5 Dec 2014 14:35:09 +0800 Subject: [PATCH] MLK-9963 usb: chipidea: otg: remove b_bus_suspend flag update Remove b_bus_suspend flag update in otg fsm driver since it's not used. Acked-by: Peter Chen Signed-off-by: Li Jun (cherry picked from commit 235e741160c2b2899806a46439c0e1b4b7073eb5) (cherry picked from commit 67d40f1e3ee92d9a69211df0e5002886155cc071) --- drivers/usb/chipidea/otg_fsm.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c index 7d57444391f4..d52ed55940d9 100644 --- a/drivers/usb/chipidea/otg_fsm.c +++ b/drivers/usb/chipidea/otg_fsm.c @@ -708,25 +708,16 @@ static void ci_otg_fsm_event(struct ci_hdrc *ci) } break; case OTG_STATE_A_PERIPHERAL: - if (intr_sts & USBi_SLI) { - fsm->b_bus_suspend = 1; + if (intr_sts & USBi_SLI) /* * Init a timer to know how long this suspend * will continue, if time out, indicates B no longer * wants to be host role */ ci_otg_add_timer(ci, A_BIDL_ADIS); - } - if (intr_sts & USBi_URI) + if (intr_sts & (USBi_URI | USBi_PCI)) ci_otg_del_timer(ci, A_BIDL_ADIS); - - if (intr_sts & USBi_PCI) { - if (fsm->b_bus_suspend == 1) { - ci_otg_del_timer(ci, A_BIDL_ADIS); - fsm->b_bus_suspend = 0; - } - } break; case OTG_STATE_A_SUSPEND: if ((intr_sts & USBi_PCI) && !port_conn) { -- 2.17.1