From 9eaabf9fbb41aacb37eb7cff9ec95e3017391932 Mon Sep 17 00:00:00 2001 From: Li Jun Date: Fri, 9 Jun 2017 18:38:06 +0800 Subject: [PATCH] MLK-15032-3 usb: chipidea: core: remove the extcon change for imx_4.1.y commit 916e43e1d6fb ("MLK-13570-3 usb: chipidea: core: change extcon usage for imx_4.1.y") is directly cherry-picked from 4.1.y, but which is not valid anymore on 4.y kernel, so revert most part and only keep the irq check after resume. Reviewed-by: Peter Chen Signed-off-by: Li Jun --- drivers/usb/chipidea/core.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index e7e38ca88ffd..229f77f4b7e3 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c @@ -574,22 +574,11 @@ static int ci_cable_notifier(struct notifier_block *nb, unsigned long event, { struct ci_hdrc_cable *cbl = container_of(nb, struct ci_hdrc_cable, nb); struct ci_hdrc *ci = cbl->ci; - struct extcon_dev *dev = ptr; - int ret; - - /* Only support ID extcon now */ - ret = extcon_get_cable_state_(dev, EXTCON_USB_HOST); - if (ret && !cbl->connected) { - cbl->connected = true; - cbl->changed = true; - ci_irq(ci->irq, ci); - } else if (!ret && cbl->connected) { - cbl->connected = false; - cbl->changed = true; - ci_irq(ci->irq, ci); - } + cbl->connected = event; + cbl->changed = true; + ci_irq(ci->irq, ci); return NOTIFY_DONE; } -- 2.17.1