diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-12 15:36:02 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-12 15:36:02 +0300 |
| commit | 5bdb080f9603c5db51597ee7bda457a153106a9a (patch) | |
| tree | ce8164f8c7b516532f93e872dc852831563613b4 /drivers/usb/core | |
| parent | 1d08ed588c6a85a35a24c82eb4cf0807ec2b366a (diff) | |
| download | linux-5bdb080f9603c5db51597ee7bda457a153106a9a.tar.xz | |
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 <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20210412213655.3776e15e@canb.auug.org.au
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/port.c | 3 |
1 files changed, 0 insertions, 3 deletions
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 <linux/slab.h> #include <linux/pm_qos.h> -#include <linux/usb/typec.h> #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); } |