usb: xhci: add PORTSC variable to xhci_hub_control()

The variable 'temp' is used multiple times throughout xhci_hub_control()
for holding only PORTSC register values.

As a follow-up to introducing a dedicated variable for PORTPMSC, rename
all remaining 'temp' to 'portsc'. This improves readability and clarifies
what is being modified.

Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://patch.msgid.link/20260402131342.2628648-20-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 4da3b48dfce0432f9499e8617ff70ea539c36e38..9cd64d6989c941b2735d93d79e97b502077ed25d 100644 (file)
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -1202,7 +1202,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
        struct xhci_hcd *xhci = hcd_to_xhci(hcd);
        int max_ports;
        unsigned long flags;
-       u32 temp, portpmsc, status;
+       u32 portsc, portpmsc, status;
        int retval = 0;
        struct xhci_bus_state *bus_state;
        u16 link_state;
@@ -1258,19 +1258,19 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        goto error;
 
                port = ports[portnum];
-               temp = xhci_portsc_readl(port);
-               if (temp == ~(u32)0) {
+               portsc = xhci_portsc_readl(port);
+               if (portsc == ~(u32)0) {
                        xhci_hc_died(xhci);
                        retval = -ENODEV;
                        break;
                }
-               trace_xhci_get_port_status(port, temp);
-               status = xhci_get_port_status(hcd, bus_state, portnum, temp, &flags);
+               trace_xhci_get_port_status(port, portsc);
+               status = xhci_get_port_status(hcd, bus_state, portnum, portsc, &flags);
                if (status == 0xffffffff)
                        goto error;
 
                xhci_dbg(xhci, "Get port status %d-%d read: 0x%x, return 0x%x",
-                        hcd->self.busnum, portnum + 1, temp, status);
+                        hcd->self.busnum, portnum + 1, portsc, status);
 
                put_unaligned(cpu_to_le32(status), (__le32 *) buf);
                /* if USB 3.1 extended port status return additional 4 bytes */
@@ -1283,7 +1283,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                break;
                        }
                        port_li = readl(&port->port_reg->portli);
-                       status = xhci_get_ext_port_status(temp, port_li);
+                       status = xhci_get_ext_port_status(portsc, port_li);
                        put_unaligned_le32(status, &buf[4]);
                }
                break;
@@ -1293,18 +1293,18 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        goto error;
 
                port = ports[portnum];
-               temp = xhci_portsc_readl(port);
-               if (temp == ~(u32)0) {
+               portsc = xhci_portsc_readl(port);
+               if (portsc == ~(u32)0) {
                        xhci_hc_died(xhci);
                        retval = -ENODEV;
                        break;
                }
-               temp = xhci_port_state_to_neutral(temp);
+               portsc = xhci_port_state_to_neutral(portsc);
                /* FIXME: What new port features do we need to support? */
                switch (wValue) {
                case USB_PORT_FEAT_SUSPEND:
-                       temp = xhci_portsc_readl(port);
-                       if ((temp & PORT_PLS_MASK) != XDEV_U0) {
+                       portsc = xhci_portsc_readl(port);
+                       if ((portsc & PORT_PLS_MASK) != XDEV_U0) {
                                /* Resume the port to U0 first */
                                xhci_set_link_state(xhci, port, XDEV_U0);
                                spin_unlock_irqrestore(&xhci->lock, flags);
@@ -1315,9 +1315,9 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         * a port unless the port reports that it is in the
                         * enabled (PED = ‘1’,PLS < ‘3’) state.
                         */
-                       temp = xhci_portsc_readl(port);
-                       if ((temp & PORT_PE) == 0 || (temp & PORT_RESET)
-                               || (temp & PORT_PLS_MASK) >= XDEV_U3) {
+                       portsc = xhci_portsc_readl(port);
+                       if ((portsc & PORT_PE) == 0 || (portsc & PORT_RESET) ||
+                           (portsc & PORT_PLS_MASK) >= XDEV_U3) {
                                xhci_warn(xhci, "USB core suspending port %d-%d not in U0/U1/U2\n",
                                          hcd->self.busnum, portnum + 1);
                                goto error;
@@ -1338,26 +1338,26 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        msleep(10); /* wait device to enter */
                        spin_lock_irqsave(&xhci->lock, flags);
 
-                       temp = xhci_portsc_readl(port);
+                       portsc = xhci_portsc_readl(port);
                        bus_state->suspended_ports |= 1 << portnum;
                        break;
                case USB_PORT_FEAT_LINK_STATE:
                        link_state = (wIndex & 0xff00) >> 3;
-                       temp = xhci_portsc_readl(port);
+                       portsc = xhci_portsc_readl(port);
                        /* Disable port */
                        if (link_state == USB_SS_PORT_LS_SS_DISABLED) {
                                xhci_dbg(xhci, "Disable port %d-%d\n",
                                         hcd->self.busnum, portnum + 1);
-                               temp = xhci_port_state_to_neutral(temp);
+                               portsc = xhci_port_state_to_neutral(portsc);
                                /*
                                 * Clear all change bits, so that we get a new
                                 * connection event.
                                 */
-                               temp |= PORT_CSC | PORT_PEC | PORT_WRC |
-                                       PORT_OCC | PORT_RC | PORT_PLC |
-                                       PORT_CEC;
-                               xhci_portsc_writel(port, temp | PORT_PE);
-                               temp = xhci_portsc_readl(port);
+                               portsc |= PORT_CSC | PORT_PEC | PORT_WRC |
+                                         PORT_OCC | PORT_RC | PORT_PLC |
+                                         PORT_CEC;
+                               xhci_portsc_writel(port, portsc | PORT_PE);
+                               portsc = xhci_portsc_readl(port);
                                break;
                        }
 
@@ -1366,7 +1366,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                xhci_dbg(xhci, "Enable port %d-%d\n",
                                         hcd->self.busnum, portnum + 1);
                                xhci_set_link_state(xhci, port, XDEV_RXDETECT);
-                               temp = xhci_portsc_readl(port);
+                               portsc = xhci_portsc_readl(port);
                                break;
                        }
 
@@ -1390,7 +1390,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                        break;
                                }
 
-                               if ((temp & PORT_CONNECT)) {
+                               if ((portsc & PORT_CONNECT)) {
                                        xhci_warn(xhci, "Can't set compliance mode when port is connected\n");
                                        goto error;
                                }
@@ -1399,11 +1399,11 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                         hcd->self.busnum, portnum + 1);
                                xhci_set_link_state(xhci, port, XDEV_COMP_MODE);
 
-                               temp = xhci_portsc_readl(port);
+                               portsc = xhci_portsc_readl(port);
                                break;
                        }
                        /* Port must be enabled */
-                       if (!(temp & PORT_PE)) {
+                       if (!(portsc & PORT_PE)) {
                                retval = -ENODEV;
                                break;
                        }
@@ -1422,7 +1422,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         * completion
                         */
                        if (link_state == USB_SS_PORT_LS_U0) {
-                               u32 pls = temp & PORT_PLS_MASK;
+                               u32 pls = portsc & PORT_PLS_MASK;
                                bool wait_u0 = false;
 
                                /* already in U0 */
@@ -1447,7 +1447,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                        xhci_dbg(xhci, "missing U0 port change event for port %d-%d\n",
                                                 hcd->self.busnum, portnum + 1);
                                spin_lock_irqsave(&xhci->lock, flags);
-                               temp = xhci_portsc_readl(port);
+                               portsc = xhci_portsc_readl(port);
                                break;
                        }
 
@@ -1465,12 +1465,12 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                spin_unlock_irqrestore(&xhci->lock, flags);
                                while (retries--) {
                                        usleep_range(4000, 8000);
-                                       temp = xhci_portsc_readl(port);
-                                       if ((temp & PORT_PLS_MASK) == XDEV_U3)
+                                       portsc = xhci_portsc_readl(port);
+                                       if ((portsc & PORT_PLS_MASK) == XDEV_U3)
                                                break;
                                }
                                spin_lock_irqsave(&xhci->lock, flags);
-                               temp = xhci_portsc_readl(port);
+                               portsc = xhci_portsc_readl(port);
                                bus_state->suspended_ports |= 1 << portnum;
                        }
                        break;
@@ -1484,24 +1484,24 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        xhci_set_port_power(xhci, port, true, &flags);
                        break;
                case USB_PORT_FEAT_RESET:
-                       temp = (temp | PORT_RESET);
-                       xhci_portsc_writel(port, temp);
+                       portsc |= PORT_RESET;
+                       xhci_portsc_writel(port, portsc);
 
-                       temp = xhci_portsc_readl(port);
+                       portsc = xhci_portsc_readl(port);
                        xhci_dbg(xhci, "set port reset, actual port %d-%d status  = 0x%x\n",
-                                hcd->self.busnum, portnum + 1, temp);
+                                hcd->self.busnum, portnum + 1, portsc);
                        break;
                case USB_PORT_FEAT_REMOTE_WAKE_MASK:
                        wake_mask = wIndex & 0xff00;
                        xhci_set_remote_wake_mask(xhci, port, wake_mask);
-                       temp = xhci_portsc_readl(port);
+                       portsc = xhci_portsc_readl(port);
                        xhci_dbg(xhci, "set port remote wake mask, actual port %d-%d status  = 0x%x\n",
-                                hcd->self.busnum, portnum + 1, temp);
+                                hcd->self.busnum, portnum + 1, portsc);
                        break;
                case USB_PORT_FEAT_BH_PORT_RESET:
-                       temp |= PORT_WR;
-                       xhci_portsc_writel(port, temp);
-                       temp = xhci_portsc_readl(port);
+                       portsc |= PORT_WR;
+                       xhci_portsc_writel(port, portsc);
+                       portsc = xhci_portsc_readl(port);
                        break;
                case USB_PORT_FEAT_U1_TIMEOUT:
                        if (hcd->speed < HCD_USB3)
@@ -1538,7 +1538,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        goto error;
                }
                /* unblock any posted writes */
-               temp = xhci_portsc_readl(port);
+               portsc = xhci_portsc_readl(port);
                break;
        case ClearPortFeature:
                portnum = (wIndex & 0xff) - 1;
@@ -1546,23 +1546,23 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        goto error;
 
                port = ports[portnum];
-               temp = xhci_portsc_readl(port);
-               if (temp == ~(u32)0) {
+               portsc = xhci_portsc_readl(port);
+               if (portsc == ~(u32)0) {
                        xhci_hc_died(xhci);
                        retval = -ENODEV;
                        break;
                }
                /* FIXME: What new port features do we need to support? */
-               temp = xhci_port_state_to_neutral(temp);
+               portsc = xhci_port_state_to_neutral(portsc);
                switch (wValue) {
                case USB_PORT_FEAT_SUSPEND:
-                       temp = xhci_portsc_readl(port);
+                       portsc = xhci_portsc_readl(port);
                        xhci_dbg(xhci, "clear USB_PORT_FEAT_SUSPEND\n");
-                       xhci_dbg(xhci, "PORTSC %04x\n", temp);
-                       if (temp & PORT_RESET)
+                       xhci_dbg(xhci, "PORTSC %04x\n", portsc);
+                       if (portsc & PORT_RESET)
                                goto error;
-                       if ((temp & PORT_PLS_MASK) == XDEV_U3) {
-                               if ((temp & PORT_PE) == 0)
+                       if ((portsc & PORT_PLS_MASK) == XDEV_U3) {
+                               if ((portsc & PORT_PE) == 0)
                                        goto error;
 
                                set_bit(portnum, &bus_state->resuming_ports);
@@ -1593,7 +1593,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                case USB_PORT_FEAT_C_ENABLE:
                case USB_PORT_FEAT_C_PORT_LINK_STATE:
                case USB_PORT_FEAT_C_PORT_CONFIG_ERROR:
-                       xhci_clear_port_change_bit(xhci, wValue, port, temp);
+                       xhci_clear_port_change_bit(xhci, wValue, port, portsc);
                        break;
                case USB_PORT_FEAT_ENABLE:
                        xhci_disable_port(xhci, port);