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

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

drivers/usb/cdns3/core.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

drivers/usb/common/usb-conn-gpio.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

drivers/usb/musb/jz4740.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/usb/roles/intel-xhci-usb-role-switch.c

+0 −2
Original line number Diff line number Diff line
@@ -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) {

include/linux/usb/role.h

+0 −1
Original line number Diff line number Diff line
@@ -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,