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

[ Upstream commit df49f2a0ac4a34c0cb4b5c233fcfa0add644c43c ]

This reverts commit edd60d24bd858cef165274e4cd6cab43bdc58d15.

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: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Fixes: edd60d24bd85 ("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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index 69d2921..dbcdf3b 100644 (file)
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -252,8 +252,6 @@ static enum usb_role cdns_hw_role_state_machine(struct cdns *cdns)
                if (!vbus)
                        role = USB_ROLE_NONE;
                break;
-       default:
-               break;
        }
 
        dev_dbg(cdns->dev, "role %d -> %d\n", cdns->role, role);

diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c
index 30bdb81..e20874c 100644 (file)
--- a/drivers/usb/common/usb-conn-gpio.c
+++ b/drivers/usb/common/usb-conn-gpio.c
@@ -257,9 +257,6 @@ static int usb_conn_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, info);
        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 */
        usb_conn_queue_dwork(info, 0);
 

diff --git a/drivers/usb/musb/jz4740.c b/drivers/usb/musb/jz4740.c
index df4e9d3..d1e4e0d 100644 (file)
--- a/drivers/usb/musb/jz4740.c
+++ b/drivers/usb/musb/jz4740.c
@@ -91,8 +91,6 @@ static int jz4740_musb_role_switch_set(struct usb_role_switch *sw,
        case USB_ROLE_HOST:
                atomic_notifier_call_chain(&phy->notifier, USB_EVENT_ID, phy);
                break;
-       default:
-               break;
        }
 
        return 0;

diff --git a/drivers/usb/roles/intel-xhci-usb-role-switch.c b/drivers/usb/roles/intel-xhci-usb-role-switch.c
index 4d6a3dd..5c96e92 100644 (file)
--- a/drivers/usb/roles/intel-xhci-usb-role-switch.c
+++ b/drivers/usb/roles/intel-xhci-usb-role-switch.c
@@ -97,8 +97,6 @@ static int intel_xhci_usb_set_role(struct usb_role_switch *sw,
                val |= SW_VBUS_VALID;
                drd_config = DRD_CONFIG_STATIC_DEVICE;
                break;
-       default:
-               break;
        }
        val |= SW_IDPIN_EN;
        if (data->enable_sw_switch) {

diff --git a/include/linux/usb/role.h b/include/linux/usb/role.h
index 65e790a..b5deafd 100644 (file)
--- a/include/linux/usb/role.h
+++ b/include/linux/usb/role.h
@@ -11,7 +11,6 @@ enum usb_role {
        USB_ROLE_NONE,
        USB_ROLE_HOST,
        USB_ROLE_DEVICE,
-       USB_ROLE_UNKNOWN,
 };
 
 typedef int (*usb_role_switch_set_t)(struct usb_role_switch *sw,