xhci: Remove dead code in xhci_move_dequeue_past_td()

This codepath is trivially dead, since the function is never called with
a non-NULL td (the only callsite is immediately preceded by a NULL guard).

[remove unused label 'deq_found' -Mathias]

Signed-off-by: Hector Martin <marcan@marcan.st>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20240626124835.1023046-2-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 fd0cde3d1569c746c414bbac085a470b793dd529..ffb3ebb72eaa2e37158c5634114669aa1fad6ae9 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -654,25 +654,6 @@ static int xhci_move_dequeue_past_td(struct xhci_hcd *xhci,
                          stream_id);
                return -ENODEV;
        }
-       /*
-        * A cancelled TD can complete with a stall if HW cached the trb.
-        * In this case driver can't find td, but if the ring is empty we
-        * can move the dequeue pointer to the current enqueue position.
-        * We shouldn't hit this anymore as cached cancelled TRBs are given back
-        * after clearing the cache, but be on the safe side and keep it anyway
-        */
-       if (!td) {
-               if (list_empty(&ep_ring->td_list)) {
-                       new_seg = ep_ring->enq_seg;
-                       new_deq = ep_ring->enqueue;
-                       new_cycle = ep_ring->cycle_state;
-                       xhci_dbg(xhci, "ep ring empty, Set new dequeue = enqueue");
-                       goto deq_found;
-               } else {
-                       xhci_warn(xhci, "Can't find new dequeue state, missing td\n");
-                       return -EINVAL;
-               }
-       }
 
        hw_dequeue = xhci_get_hw_deq(xhci, dev, ep_index, stream_id);
        new_seg = ep_ring->deq_seg;
@@ -709,8 +690,6 @@ static int xhci_move_dequeue_past_td(struct xhci_hcd *xhci,
 
        } while (!cycle_found || !td_last_trb_found);
 
-deq_found:
-
        /* Don't update the ring cycle state for the producer (us). */
        addr = xhci_trb_virt_to_dma(new_seg, new_deq);
        if (addr == 0) {