moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "usb: Link the ports to the connectors they are attached to"

Browse Source 
This reverts commit 63cd786173 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>
This commit is contained in:
Greg Kroah-Hartman
2021-04-12 14:36:02 +02:00
parent 1d08ed588c
commit 5bdb080f96
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/ABI/testing/sysfs-bus-usb
View File

@@ -255,15 +255,6 @@ Description:
is permitted, "u2" if only u2 is permitted, "u1_u2" if both u1 and is permitted, "u2" if only u2 is permitted, "u1_u2" if both u1 and
u2 are permitted. u2 are permitted.
What: /sys/bus/usb/devices/.../(hub interface)/portX/connector
Date: April 2021
Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
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 What: /sys/bus/usb/devices/.../power/usb2_lpm_l1_timeout
Date: May 2013 Date: May 2013
Contact: Mathias Nyman <mathias.nyman@linux.intel.com> Contact: Mathias Nyman <mathias.nyman@linux.intel.com>

3
drivers/usb/core/port.c
View File

@@ -9,7 +9,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pm_qos.h> #include <linux/pm_qos.h>
#include <linux/usb/typec.h>
#include "hub.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); find_and_link_peer(hub, port1);
typec_link_port(&port_dev->dev);
/* /*
* Enable runtime pm and hold a refernce that hub_configure() * 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; peer = port_dev->peer;
if (peer) if (peer)
unlink_peers(port_dev, peer); unlink_peers(port_dev, peer);
typec_unlink_port(&port_dev->dev);
device_unregister(&port_dev->dev); device_unregister(&port_dev->dev);
} }