xhci: remove unused stream_id parameter from xhci_handle_halted_endpoint()

The stream_id parameter is no longer used when handling halted endpoints.
Remove it

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20221130091944.2171610-7-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 039ec97..ddc3003 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -896,7 +896,7 @@ done:
 }
 
 static int xhci_handle_halted_endpoint(struct xhci_hcd *xhci,
-                               struct xhci_virt_ep *ep, unsigned int stream_id,
+                               struct xhci_virt_ep *ep,
                                struct xhci_td *td,
                                enum xhci_ep_reset_type reset_type)
 {
@@ -1110,8 +1110,7 @@ static void xhci_handle_cmd_stop_ep(struct xhci_hcd *xhci, int slot_id,
                                        td->status = -EPROTO;
                        }
                        /* reset ep, reset handler cleans up cancelled tds */
-                       err = xhci_handle_halted_endpoint(xhci, ep, 0, td,
-                                                         reset_type);
+                       err = xhci_handle_halted_endpoint(xhci, ep, td, reset_type);
                        if (err)
                                break;
                        ep->ep_state &= ~EP_STOP_CMD_PENDING;
@@ -2183,8 +2182,7 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
                }
                /* Almost same procedure as for STALL_ERROR below */
                xhci_clear_hub_tt_buffer(xhci, td, ep);
-               xhci_handle_halted_endpoint(xhci, ep, ep_ring->stream_id, td,
-                                           EP_HARD_RESET);
+               xhci_handle_halted_endpoint(xhci, ep, td, EP_HARD_RESET);
                return 0;
        case COMP_STALL_ERROR:
                /*
@@ -2200,8 +2198,7 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
                if (ep->ep_index != 0)
                        xhci_clear_hub_tt_buffer(xhci, td, ep);
 
-               xhci_handle_halted_endpoint(xhci, ep, ep_ring->stream_id, td,
-                                           EP_HARD_RESET);
+               xhci_handle_halted_endpoint(xhci, ep, td, EP_HARD_RESET);
 
                return 0; /* xhci_handle_halted_endpoint marked td cancelled */
        default:
@@ -2490,8 +2487,7 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
 
                td->status = 0;
 
-               xhci_handle_halted_endpoint(xhci, ep, ep_ring->stream_id, td,
-                                           EP_SOFT_RESET);
+               xhci_handle_halted_endpoint(xhci, ep, td, EP_SOFT_RESET);
                return 0;
        default:
                /* do nothing */
@@ -2568,10 +2564,10 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                        xhci_dbg(xhci, "Stream transaction error ep %u no id\n",
                                 ep_index);
                        if (ep->err_count++ > MAX_SOFT_RETRY)
-                               xhci_handle_halted_endpoint(xhci, ep, 0, NULL,
+                               xhci_handle_halted_endpoint(xhci, ep, NULL,
                                                            EP_HARD_RESET);
                        else
-                               xhci_handle_halted_endpoint(xhci, ep, 0, NULL,
+                               xhci_handle_halted_endpoint(xhci, ep, NULL,
                                                            EP_SOFT_RESET);
                        goto cleanup;
                case COMP_RING_UNDERRUN:
@@ -2755,9 +2751,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                        if (trb_comp_code == COMP_STALL_ERROR ||
                            xhci_requires_manual_halt_cleanup(xhci, ep_ctx,
                                                              trb_comp_code)) {
-                               xhci_handle_halted_endpoint(xhci, ep,
-                                                           ep_ring->stream_id,
-                                                           NULL,
+                               xhci_handle_halted_endpoint(xhci, ep, NULL,
                                                            EP_HARD_RESET);
                        }
                        goto cleanup;
@@ -2850,9 +2844,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                        if (trb_comp_code == COMP_STALL_ERROR ||
                            xhci_requires_manual_halt_cleanup(xhci, ep_ctx,
                                                              trb_comp_code))
-                               xhci_handle_halted_endpoint(xhci, ep,
-                                                           ep_ring->stream_id,
-                                                           td, EP_HARD_RESET);
+                               xhci_handle_halted_endpoint(xhci, ep, td,
+                                                           EP_HARD_RESET);
                        goto cleanup;
                }