xhci: rename resume_done to resume_timestamp

resume_done is just a timestamp, avoid confusing it with completions
related to port state transitions that are named *_done

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20230202150505.618915-10-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 b27969e..a2053aa 100644 (file)
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -943,7 +943,7 @@ static int xhci_handle_usb2_port_link_resume(struct xhci_port *port,
                return -EINVAL;
        }
        /* did port event handler already start resume timing? */
-       if (!port->resume_done) {
+       if (!port->resume_timestamp) {
                /* If not, maybe we are in a host initated resume? */
                if (test_bit(wIndex, &bus_state->resuming_ports)) {
                        /* Host initated resume doesn't time the resume
@@ -960,18 +960,18 @@ static int xhci_handle_usb2_port_link_resume(struct xhci_port *port,
                                msecs_to_jiffies(USB_RESUME_TIMEOUT);
 
                        set_bit(wIndex, &bus_state->resuming_ports);
-                       port->resume_done = timeout;
+                       port->resume_timestamp = timeout;
                        mod_timer(&hcd->rh_timer, timeout);
                        usb_hcd_start_port_resume(&hcd->self, wIndex);
                }
        /* Has resume been signalled for USB_RESUME_TIME yet? */
-       } else if (time_after_eq(jiffies, port->resume_done)) {
+       } else if (time_after_eq(jiffies, port->resume_timestamp)) {
                int time_left;
 
                xhci_dbg(xhci, "resume USB2 port %d-%d\n",
                         hcd->self.busnum, wIndex + 1);
 
-               port->resume_done = 0;
+               port->resume_timestamp = 0;
                clear_bit(wIndex, &bus_state->resuming_ports);
                port->rexit_active = true;
 
@@ -1106,10 +1106,10 @@ static void xhci_get_usb2_port_status(struct xhci_port *port, u32 *status,
                if (link_state == XDEV_U2)
                        *status |= USB_PORT_STAT_L1;
                if (link_state == XDEV_U0) {
-                       if (port->resume_done)
+                       if (port->resume_timestamp)
                                usb_hcd_end_port_resume(&port->rhub->hcd->self,
                                                        portnum);
-                       port->resume_done = 0;
+                       port->resume_timestamp = 0;
                        clear_bit(portnum, &bus_state->resuming_ports);
                        if (bus_state->suspended_ports & (1 << portnum)) {
                                bus_state->suspended_ports &= ~(1 << portnum);
@@ -1181,11 +1181,11 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
         * Clear stale usb2 resume signalling variables in case port changed
         * state during resume signalling. For example on error
         */
-       if ((port->resume_done ||
+       if ((port->resume_timestamp ||
             test_bit(wIndex, &bus_state->resuming_ports)) &&
            (raw_port_status & PORT_PLS_MASK) != XDEV_U3 &&
            (raw_port_status & PORT_PLS_MASK) != XDEV_RESUME) {
-               port->resume_done = 0;
+               port->resume_timestamp = 0;
                clear_bit(wIndex, &bus_state->resuming_ports);
                usb_hcd_end_port_resume(&hcd->self, wIndex);
        }
@@ -1693,8 +1693,8 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
 
                if ((temp & mask) != 0 ||
                        (bus_state->port_c_suspend & 1 << i) ||
-                       (ports[i]->resume_done && time_after_eq(
-                           jiffies, ports[i]->resume_done))) {
+                       (ports[i]->resume_timestamp && time_after_eq(
+                           jiffies, ports[i]->resume_timestamp))) {
                        buf[(i + 1) / 8] |= 1 << (i + 1) % 8;
                        status = 1;
                }

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 611580d..eb788c6 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1924,7 +1924,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
                        goto cleanup;
                } else if (!test_bit(hcd_portnum, &bus_state->resuming_ports)) {
                        xhci_dbg(xhci, "resume HS port %d\n", port_id);
-                       port->resume_done = jiffies +
+                       port->resume_timestamp = jiffies +
                                msecs_to_jiffies(USB_RESUME_TIMEOUT);
                        set_bit(hcd_portnum, &bus_state->resuming_ports);
                        /* Do the rest in GetPortStatus after resume time delay.
@@ -1933,7 +1933,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
                         */
                        set_bit(HCD_FLAG_POLL_RH, &hcd->flags);
                        mod_timer(&hcd->rh_timer,
-                                 port->resume_done);
+                                 port->resume_timestamp);
                        usb_hcd_start_port_resume(&hcd->self, hcd_portnum);
                        bogus_port_status = true;
                }

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 578e219..786002b 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1740,7 +1740,7 @@ struct xhci_port {
        struct xhci_hub         *rhub;
        struct xhci_port_cap    *port_cap;
        unsigned int            lpm_incapable:1;
-       unsigned long           resume_done;
+       unsigned long           resume_timestamp;
        bool                    rexit_active;
        struct completion       rexit_done;
        struct completion       u3exit_done;