Skip to content

Commit 5bdb080

Browse files
committed
Revert "usb: Link the ports to the connectors they are attached to"
This reverts commit 63cd786 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>
1 parent 1d08ed5 commit 5bdb080

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

Documentation/ABI/testing/sysfs-bus-usb

-9
Original file line numberDiff line numberDiff line change
@@ -255,15 +255,6 @@ Description:
255255
is permitted, "u2" if only u2 is permitted, "u1_u2" if both u1 and
256256
u2 are permitted.
257257

258-
What: /sys/bus/usb/devices/.../(hub interface)/portX/connector
259-
Date: April 2021
260-
Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
261-
Description:
262-
Link to the USB Type-C connector when available. This link is
263-
only created when USB Type-C Connector Class is enabled, and
264-
only if the system firmware is capable of describing the
265-
connection between a port and its connector.
266-
267258
What: /sys/bus/usb/devices/.../power/usb2_lpm_l1_timeout
268259
Date: May 2013
269260
Contact: Mathias Nyman <mathias.nyman@linux.intel.com>

drivers/usb/core/port.c

-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include <linux/slab.h>
1111
#include <linux/pm_qos.h>
12-
#include <linux/usb/typec.h>
1312

1413
#include "hub.h"
1514

@@ -577,7 +576,6 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1)
577576
}
578577

579578
find_and_link_peer(hub, port1);
580-
typec_link_port(&port_dev->dev);
581579

582580
/*
583581
* 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)
621619
peer = port_dev->peer;
622620
if (peer)
623621
unlink_peers(port_dev, peer);
624-
typec_unlink_port(&port_dev->dev);
625622
device_unregister(&port_dev->dev);
626623
}

0 commit comments

Comments
 (0)