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: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 1e96d1f..7a62b02 100644 (file)
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -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;
                }

diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index d873a03..9afce47 100644 (file)
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -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) {

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index cae8e23..bfb3fab 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -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;
 };