From 5bdb080f9603c5db51597ee7bda457a153106a9a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 12 Apr 2021 14:36:02 +0200 Subject: [PATCH] Revert "usb: Link the ports to the connectors they are attached to" This reverts commit 63cd78617350dae99cc5fbd8f643b83ee819fe33 as it causes a build error: depmod: ERROR: Cycle detected: usbcore -> typec -> usbcore depmod: ERROR: Found 2 modules in dependency cycles! Reported-by: Stephen Rothwell Link: https://lore.kernel.org/r/20210412213655.3776e15e@canb.auug.org.au Cc: Heikki Krogerus Signed-off-by: Greg Kroah-Hartman --- Documentation/ABI/testing/sysfs-bus-usb | 9 --------- drivers/usb/core/port.c | 3 --- 2 files changed, 12 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb index 8b4303a0ff51..bf2c1968525f 100644 --- a/Documentation/ABI/testing/sysfs-bus-usb +++ b/Documentation/ABI/testing/sysfs-bus-usb @@ -255,15 +255,6 @@ Description: is permitted, "u2" if only u2 is permitted, "u1_u2" if both u1 and u2 are permitted. -What: /sys/bus/usb/devices/.../(hub interface)/portX/connector -Date: April 2021 -Contact: Heikki Krogerus -Description: - Link to the USB Type-C connector when available. This link is - only created when USB Type-C Connector Class is enabled, and - only if the system firmware is capable of describing the - connection between a port and its connector. - What: /sys/bus/usb/devices/.../power/usb2_lpm_l1_timeout Date: May 2013 Contact: Mathias Nyman diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c index 3c382a4b648e..dfcca9c876c7 100644 --- a/drivers/usb/core/port.c +++ b/drivers/usb/core/port.c @@ -9,7 +9,6 @@ #include #include -#include #include "hub.h" @@ -577,7 +576,6 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1) } find_and_link_peer(hub, port1); - typec_link_port(&port_dev->dev); /* * Enable runtime pm and hold a refernce that hub_configure() @@ -621,6 +619,5 @@ void usb_hub_remove_port_device(struct usb_hub *hub, int port1) peer = port_dev->peer; if (peer) unlink_peers(port_dev, peer); - typec_unlink_port(&port_dev->dev); device_unregister(&port_dev->dev); } -- 2.11.0