xhci: change xhci_test_and_clear_bit() to use new port structure

Don't use pointers to port array and port index as function parameters
in xhci_test_and_clear_bit(), just use a pointer to the right port
structure.

xhci_test_and_clear_bit() was the last port_array user in
xhci_get_port_status() and handle_port_status(), so remove the
port_array from them as well.

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index e3be8d15c078f1db70b89e7103c10ba36b7e4a3c..05115b81f6bd9f881a94303593f1cff585afdcaa 100644 (file)
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -717,16 +717,16 @@ static void xhci_set_remote_wake_mask(struct xhci_hcd *xhci,
 }
 
 /* Test and clear port RWC bit */
-void xhci_test_and_clear_bit(struct xhci_hcd *xhci, __le32 __iomem **port_array,
-                               int port_id, u32 port_bit)
+void xhci_test_and_clear_bit(struct xhci_hcd *xhci, struct xhci_port *port,
+                            u32 port_bit)
 {
        u32 temp;
 
-       temp = readl(port_array[port_id]);
+       temp = readl(port->addr);
        if (temp & port_bit) {
                temp = xhci_port_state_to_neutral(temp);
                temp |= port_bit;
-               writel(temp, port_array[port_id]);
+               writel(temp, port->addr);
        }
 }
 
@@ -846,8 +846,7 @@ static u32 xhci_get_ext_port_status(u32 raw_port_status, u32 port_li)
  */
 static u32 xhci_get_port_status(struct usb_hcd *hcd,
                struct xhci_bus_state *bus_state,
-               __le32 __iomem **port_array,
-               u16 wIndex, u32 raw_port_status,
+       u16 wIndex, u32 raw_port_status,
                unsigned long flags)
        __releases(&xhci->lock)
        __acquires(&xhci->lock)
@@ -930,8 +929,7 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
 
                        set_bit(wIndex, &bus_state->rexit_ports);
 
-                       xhci_test_and_clear_bit(xhci, port_array, wIndex,
-                                               PORT_PLC);
+                       xhci_test_and_clear_bit(xhci, port, PORT_PLC);
                        xhci_set_link_state(xhci, port, XDEV_U0);
 
                        spin_unlock_irqrestore(&xhci->lock, flags);
@@ -1091,8 +1089,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        break;
                }
                trace_xhci_get_port_status(wIndex, temp);
-               status = xhci_get_port_status(hcd, bus_state, port_array,
-                               wIndex, temp, flags);
+               status = xhci_get_port_status(hcd, bus_state, wIndex, temp,
+                                             flags);
                if (status == 0xffffffff)
                        goto error;
 
@@ -1673,7 +1671,7 @@ int xhci_bus_resume(struct usb_hcd *hcd)
                for_each_set_bit(port_index, &bus_state->bus_suspended,
                                 BITS_PER_LONG) {
                        /* Clear PLC to poll it later for U0 transition */
-                       xhci_test_and_clear_bit(xhci, port_array, port_index,
+                       xhci_test_and_clear_bit(xhci, ports[port_index],
                                                PORT_PLC);
                        xhci_set_link_state(xhci, ports[port_index], XDEV_U0);
                }
@@ -1688,7 +1686,7 @@ int xhci_bus_resume(struct usb_hcd *hcd)
                                  port_index);
                        continue;
                }
-               xhci_test_and_clear_bit(xhci, port_array, port_index, PORT_PLC);
+               xhci_test_and_clear_bit(xhci, ports[port_index], PORT_PLC);
                slot_id = xhci_find_slot_id_by_port(hcd, xhci, port_index + 1);
                if (slot_id)
                        xhci_ring_device(xhci, slot_id);

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 6e4211eea0e237df2380227d54ffb4d85194653e..f0a99aa0ac586c4cedb0724d26493b81b2a0b752 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1527,7 +1527,6 @@ static void handle_port_status(struct xhci_hcd *xhci,
        int slot_id;
        unsigned int hcd_portnum;
        struct xhci_bus_state *bus_state;
-       __le32 __iomem **port_array;
        bool bogus_port_status = false;
        struct xhci_port *port;
 
@@ -1555,11 +1554,6 @@ static void handle_port_status(struct xhci_hcd *xhci,
 
        hcd = port->rhub->hcd;
        bus_state = &xhci->bus_state[hcd_index(hcd)];
-       if (hcd->speed >= HCD_USB3)
-               port_array = xhci->usb3_ports;
-       else
-               port_array = xhci->usb2_ports;
-
        hcd_portnum = port->hcd_portnum;
        portsc = readl(port->addr);
 
@@ -1589,8 +1583,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
                         * device and host initiated resume.
                         */
                        bus_state->port_remote_wakeup |= 1 << hcd_portnum;
-                       xhci_test_and_clear_bit(xhci, port_array,
-                                       hcd_portnum, PORT_PLC);
+                       xhci_test_and_clear_bit(xhci, port, PORT_PLC);
                        xhci_set_link_state(xhci, port, XDEV_U0);
                        /* Need to wait until the next link state change
                         * indicates the device is actually in U0.
@@ -1628,8 +1621,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
                        xhci_ring_device(xhci, slot_id);
                if (bus_state->port_remote_wakeup & (1 << hcd_portnum)) {
                        bus_state->port_remote_wakeup &= ~(1 << hcd_portnum);
-                       xhci_test_and_clear_bit(xhci, port_array,
-                                       hcd_portnum, PORT_PLC);
+                       xhci_test_and_clear_bit(xhci, port, PORT_PLC);
                        usb_wakeup_notification(hcd->self.root_hub,
                                        hcd_portnum + 1);
                        bogus_port_status = true;
@@ -1651,8 +1643,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
        }
 
        if (hcd->speed < HCD_USB3)
-               xhci_test_and_clear_bit(xhci, port_array, hcd_portnum,
-                                       PORT_PLC);
+               xhci_test_and_clear_bit(xhci, port, PORT_PLC);
 
 cleanup:
        /* Update event ring dequeue pointer before dropping the lock */

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index a13b43105a8ffee2870b83180c287d7dc9d48f6b..f1b37d3946b28a515741e6cfa763e0b4080e012d 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -2104,8 +2104,8 @@ unsigned int count_trbs(u64 addr, u64 len);
 /* xHCI roothub code */
 void xhci_set_link_state(struct xhci_hcd *xhci, struct xhci_port *port,
                                u32 link_state);
-void xhci_test_and_clear_bit(struct xhci_hcd *xhci, __le32 __iomem **port_array,
-                               int port_id, u32 port_bit);
+void xhci_test_and_clear_bit(struct xhci_hcd *xhci, struct xhci_port *port,
+                               u32 port_bit);
 int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex,
                char *buf, u16 wLength);
 int xhci_hub_status_data(struct usb_hcd *hcd, char *buf);