Skip to content

Commit 5fee5a5

Browse files
LuBaolugregkh
authored andcommitted
usb: xhci: Remove ep_trb from xhci_cleanup_halted_endpoint()
Function argument ep_trb for xhci_cleanup_halted_endpoint() isn't needed anymore. Cleanup it. Signed-off-by: Lu Baolu <[email protected]> Signed-off-by: Mathias Nyman <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 29f6533 commit 5fee5a5

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

drivers/usb/host/xhci-ring.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,8 +1815,7 @@ struct xhci_segment *trb_in_td(struct xhci_hcd *xhci,
18151815

18161816
static void xhci_cleanup_halted_endpoint(struct xhci_hcd *xhci,
18171817
unsigned int slot_id, unsigned int ep_index,
1818-
unsigned int stream_id,
1819-
struct xhci_td *td, union xhci_trb *ep_trb,
1818+
unsigned int stream_id, struct xhci_td *td,
18201819
enum xhci_ep_reset_type reset_type)
18211820
{
18221821
struct xhci_virt_ep *ep = &xhci->devs[slot_id]->eps[ep_index];
@@ -1957,8 +1956,7 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_td *td,
19571956
* The class driver clears the device side halt later.
19581957
*/
19591958
xhci_cleanup_halted_endpoint(xhci, slot_id, ep_index,
1960-
ep_ring->stream_id, td, ep_trb,
1961-
EP_HARD_RESET);
1959+
ep_ring->stream_id, td, EP_HARD_RESET);
19621960
} else {
19631961
/* Update ring dequeue pointer */
19641962
while (ep_ring->dequeue != td->last_trb)
@@ -2318,7 +2316,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
23182316
case COMP_INVALID_STREAM_TYPE_ERROR:
23192317
case COMP_INVALID_STREAM_ID_ERROR:
23202318
xhci_cleanup_halted_endpoint(xhci, slot_id, ep_index, 0,
2321-
NULL, NULL, EP_SOFT_RESET);
2319+
NULL, EP_SOFT_RESET);
23222320
goto cleanup;
23232321
case COMP_RING_UNDERRUN:
23242322
case COMP_RING_OVERRUN:
@@ -2584,8 +2582,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
25842582
xhci_cleanup_halted_endpoint(xhci, slot_id,
25852583
ep_index,
25862584
ep_ring->stream_id,
2587-
td, ep_trb,
2588-
EP_HARD_RESET);
2585+
td, EP_HARD_RESET);
25892586
goto cleanup;
25902587
}
25912588

0 commit comments

Comments
 (0)