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

BugLink: https://bugs.launchpad.net/bugs/2034469
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index 69d2921f2d3b5a469d043166dfcd33b580f5b8d1..dbcdf3b24b47793caffd28ff1ed542c31c2ba133 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 30bdb81934bc838063f408151e96a9624fbd8dae..e20874caba363c7178fbe247186f1e34d9bf88a5 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 0349c44d4d331b6026a956f656955bc23d170b4a..c7b1d2a394d9ad7cb62f7196368147466947b544 100644 (file)
--- a/drivers/usb/musb/jz4740.c
+++ b/drivers/usb/musb/jz4740.c
@@ -95,8 +95,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 4d6a3dd06e011713ddab83b99d98a7b3ab95c865..5c96e929acea0ec490e3cb1719440d9592ffcf26 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 65e790a28913eee9b78392646250c5f3808116fb..b5deafd91f67bb58f04c4c9189bf37b1fcfe28f1 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,