Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11e1d25d authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: remove unused stopped_td pointer 



We no longer keep track of where we stopped in a stopped_td pointer.
We get the ring dequeue pointer from the endpoint or stream context

Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f7c3cde

drivers/usb/host/xhci-ring.c

+0 −4
Original line number Diff line number Diff line
@@ -715,7 +715,6 @@ static void xhci_handle_cmd_stop_ep(struct xhci_hcd *xhci, int slot_id, 


	if (list_empty(&ep->cancelled_td_list)) {

		xhci_stop_watchdog_timer_in_irq(xhci, ep);

		ep->stopped_td = NULL;

		ring_doorbell_for_active_rings(xhci, slot_id, ep_index);

		return;

	}
@@ -780,8 +779,6 @@ static void xhci_handle_cmd_stop_ep(struct xhci_hcd *xhci, int slot_id, 
		ring_doorbell_for_active_rings(xhci, slot_id, ep_index);

	}



	ep->stopped_td = NULL;



	/*

	 * Drop the lock and complete the URBs in the cancelled TD list.

	 * New TDs to be cancelled might be added to the end of the list before
@@ -1935,7 +1932,6 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_td *td, 
		 * stopped TDs.  A stopped TD may be restarted, so don't update

		 * the ring dequeue pointer or take this TD off any lists yet.

		 */

		ep->stopped_td = td;

		return 0;

	}

	if (trb_comp_code == COMP_STALL_ERROR ||

drivers/usb/host/xhci.h

+0 −1
Original line number Diff line number Diff line
@@ -924,7 +924,6 @@ struct xhci_virt_ep { 
#define EP_GETTING_NO_STREAMS	(1 << 5)

	/* ----  Related to URB cancellation ---- */

	struct list_head	cancelled_td_list;

	struct xhci_td		*stopped_td;

	unsigned int		stopped_stream;

	/* Watchdog timer for stop endpoint command to cancel URBs */

	struct timer_list	stop_cmd_timer;