From 7d66b57d1d5ff345b0bfb2acb6c040882bbf4f39 Mon Sep 17 00:00:00 2001 From: Carlos Llamas Date: Sat, 12 Apr 2025 18:26:09 +0000 Subject: [PATCH] ANDROID: align declaration order with upstream Upstream resolved the conflict of xhci_process_cancelled_tds() and xhci_stop_endpoint_sync() declarations in a different order and this causes merge conflicts when backporting more patches. Align with the declaration order that upstream has. Cc: Wesley Cheng Fixes: 3e516122b4d52 ("BACKPORT: xhci: add helper to stop endpoint and wait for completion") Change-Id: Ief1d0c9b88709464f0565fd5da0755378360623d Signed-off-by: Carlos Llamas --- drivers/usb/host/xhci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 70a674c436ef..df7023570a81 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1916,9 +1916,9 @@ void xhci_ring_doorbell_for_active_rings(struct xhci_hcd *xhci, void xhci_cleanup_command_queue(struct xhci_hcd *xhci); void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring); unsigned int count_trbs(u64 addr, u64 len); -void xhci_process_cancelled_tds(struct xhci_virt_ep *ep); int xhci_stop_endpoint_sync(struct xhci_hcd *xhci, struct xhci_virt_ep *ep, int suspend, gfp_t gfp_flags); +void xhci_process_cancelled_tds(struct xhci_virt_ep *ep); /* xHCI roothub code */ void xhci_set_link_state(struct xhci_hcd *xhci, struct xhci_port *port,