Commit df49f2a0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "usb: common: usb-conn-gpio: Set last role to unknown before initial detection"

This reverts commit edd60d24.

Heikki reports that this should not be a global flag just to work around
one broken driver and should be fixed differently, so revert it.
Reported-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Fixes: edd60d24 ("usb: common: usb-conn-gpio: Set last role to unknown before initial detection")
Link: https://lore.kernel.org/r/ZImE4L3YgABnCIsP@kuha.fi.intel.com
Cc: Prashanth K <quic_prashk@quicinc.com>
Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 53d061c1
...@@ -252,8 +252,6 @@ static enum usb_role cdns_hw_role_state_machine(struct cdns *cdns) ...@@ -252,8 +252,6 @@ static enum usb_role cdns_hw_role_state_machine(struct cdns *cdns)
if (!vbus) if (!vbus)
role = USB_ROLE_NONE; role = USB_ROLE_NONE;
break; break;
default:
break;
} }
dev_dbg(cdns->dev, "role %d -> %d\n", cdns->role, role); dev_dbg(cdns->dev, "role %d -> %d\n", cdns->role, role);
......
...@@ -257,9 +257,6 @@ static int usb_conn_probe(struct platform_device *pdev) ...@@ -257,9 +257,6 @@ static int usb_conn_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, info); platform_set_drvdata(pdev, info);
device_set_wakeup_capable(&pdev->dev, true); device_set_wakeup_capable(&pdev->dev, true);
/* Set last role to unknown before performing the initial detection */
info->last_role = USB_ROLE_UNKNOWN;
/* Perform initial detection */ /* Perform initial detection */
usb_conn_queue_dwork(info, 0); usb_conn_queue_dwork(info, 0);
......
...@@ -95,8 +95,6 @@ static int jz4740_musb_role_switch_set(struct usb_role_switch *sw, ...@@ -95,8 +95,6 @@ static int jz4740_musb_role_switch_set(struct usb_role_switch *sw,
case USB_ROLE_HOST: case USB_ROLE_HOST:
atomic_notifier_call_chain(&phy->notifier, USB_EVENT_ID, phy); atomic_notifier_call_chain(&phy->notifier, USB_EVENT_ID, phy);
break; break;
default:
break;
} }
return 0; return 0;
......
...@@ -97,8 +97,6 @@ static int intel_xhci_usb_set_role(struct usb_role_switch *sw, ...@@ -97,8 +97,6 @@ static int intel_xhci_usb_set_role(struct usb_role_switch *sw,
val |= SW_VBUS_VALID; val |= SW_VBUS_VALID;
drd_config = DRD_CONFIG_STATIC_DEVICE; drd_config = DRD_CONFIG_STATIC_DEVICE;
break; break;
default:
break;
} }
val |= SW_IDPIN_EN; val |= SW_IDPIN_EN;
if (data->enable_sw_switch) { if (data->enable_sw_switch) {
......
...@@ -11,7 +11,6 @@ enum usb_role { ...@@ -11,7 +11,6 @@ enum usb_role {
USB_ROLE_NONE, USB_ROLE_NONE,
USB_ROLE_HOST, USB_ROLE_HOST,
USB_ROLE_DEVICE, USB_ROLE_DEVICE,
USB_ROLE_UNKNOWN,
}; };
typedef int (*usb_role_switch_set_t)(struct usb_role_switch *sw, typedef int (*usb_role_switch_set_t)(struct usb_role_switch *sw,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment