Commit 00bdc4a3 authored by Niklas Neronin's avatar Niklas Neronin Committed by Greg Kroah-Hartman
Browse files

usb: xhci: remove duplicate code from 'xhci_clear_command_ring()' 



Replace a segment of code within 'xhci_clear_command_ring()' with a
function call to 'xhci_initialize_ring_info()'. This change eliminates
code duplication, as 'xhci_initialize_ring_info()' performs the same
operations as the replaced code.

Signed-off-by: default avatarNiklas Neronin <niklas.neronin@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20240229141438.619372-5-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 74151b53

drivers/usb/host/xhci.c

+1 −13
Original line number Diff line number Diff line
@@ -794,19 +794,7 @@ static void xhci_clear_command_ring(struct xhci_hcd *xhci) 
		seg = seg->next;

	} while (seg != ring->deq_seg);



	/* Reset the software enqueue and dequeue pointers */

	ring->deq_seg = ring->first_seg;

	ring->dequeue = ring->first_seg->trbs;

	ring->enq_seg = ring->deq_seg;

	ring->enqueue = ring->dequeue;



	ring->num_trbs_free = ring->num_segs * (TRBS_PER_SEGMENT - 1) - 1;

	/*

	 * Ring is now zeroed, so the HW should look for change of ownership

	 * when the cycle bit is set to 1.

	 */

	ring->cycle_state = 1;



	xhci_initialize_ring_info(ring, 1);

	/*

	 * Reset the hardware dequeue pointer.

	 * Yes, this will need to be re-written after resume, but we're paranoid