Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe30182c authored by Sarah Sharp's avatar Sarah Sharp Committed by Greg Kroah-Hartman
Browse files

xhci: Rename virt_dev->port to fake_port. 



The "port" field in xhci_virt_dev stores the port number associated with
one of the two xHCI split roothubs, not the unique port number the xHCI
hardware uses.  Since we'll need to store the real hardware port number in
future patches, rename this field to "fake_port".

Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2dc37539

drivers/usb/host/xhci-hub.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ int xhci_find_slot_id_by_port(struct usb_hcd *hcd, struct xhci_hcd *xhci, 
			continue;

		speed = xhci->devs[i]->udev->speed;

		if (((speed == USB_SPEED_SUPER) == (hcd->speed == HCD_USB3))

				&& xhci->devs[i]->port == port) {

				&& xhci->devs[i]->fake_port == port) {

			slot_id = i;

			break;

		}

drivers/usb/host/xhci-mem.c

+2 −2
Original line number Diff line number Diff line
@@ -921,9 +921,9 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud 
	for (top_dev = udev; top_dev->parent && top_dev->parent->parent;

			top_dev = top_dev->parent)

		/* Found device below root hub */;

	dev->port = top_dev->portnum;

	dev->fake_port = top_dev->portnum;

	xhci_dbg(xhci, "Set root hub portnum to %d\n", port_num);

	xhci_dbg(xhci, "Set fake root hub portnum to %d\n", dev->port);

	xhci_dbg(xhci, "Set fake root hub portnum to %d\n", dev->fake_port);



	/* Is this a LS/FS device under an external HS hub? */

	if (udev->tt && udev->tt->hub->parent) {

drivers/usb/host/xhci.h

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ struct xhci_virt_device { 
	/* Status of the last command issued for this device */

	u32				cmd_status;

	struct list_head		cmd_list;

	u8				port;

	u8				fake_port;

};