usb: xhci: remove duplicate TRB_TO_SLOT_ID() calls

Remove unnecessary repeated calls to TRB_TO_SLOT_ID(). The slot ID is
stored in the 'slot_id' variable at the function's start.

Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20240429140245.3955523-18-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index b395708c488c23fce600db2e81581ead6d6b2313..a7423ed992ee0b3180952bf5ff1cda0e209aabb4 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2723,20 +2723,16 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                 */
                xhci_dbg(xhci, "underrun event on endpoint\n");
                if (!list_empty(&ep_ring->td_list))
-                       xhci_dbg(xhci, "Underrun Event for slot %d ep %d "
-                                       "still with TDs queued?\n",
-                                TRB_TO_SLOT_ID(le32_to_cpu(event->flags)),
-                                ep_index);
+                       xhci_dbg(xhci, "Underrun Event for slot %u ep %d still with TDs queued?\n",
+                                slot_id, ep_index);
                if (ep->skip)
                        break;
                return 0;
        case COMP_RING_OVERRUN:
                xhci_dbg(xhci, "overrun event on endpoint\n");
                if (!list_empty(&ep_ring->td_list))
-                       xhci_dbg(xhci, "Overrun Event for slot %d ep %d "
-                                       "still with TDs queued?\n",
-                                TRB_TO_SLOT_ID(le32_to_cpu(event->flags)),
-                                ep_index);
+                       xhci_dbg(xhci, "Overrun Event for slot %u ep %d still with TDs queued?\n",
+                                slot_id, ep_index);
                if (ep->skip)
                        break;
                return 0;
@@ -2795,9 +2791,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                        if (!(trb_comp_code == COMP_STOPPED ||
                              trb_comp_code == COMP_STOPPED_LENGTH_INVALID ||
                              ep_ring->last_td_was_short)) {
-                               xhci_warn(xhci, "WARN Event TRB for slot %d ep %d with no TDs queued?\n",
-                                               TRB_TO_SLOT_ID(le32_to_cpu(event->flags)),
-                                               ep_index);
+                               xhci_warn(xhci, "WARN Event TRB for slot %u ep %d with no TDs queued?\n",
+                                         slot_id, ep_index);
                        }
                        if (ep->skip) {
                                ep->skip = false;