| From 472de28e1eeda25e4fedaea6781e8196d9288404 Mon Sep 17 00:00:00 2001 |
| From: Felipe Balbi <felipe.balbi@linux.intel.com> |
| Date: Mon, 23 Jan 2017 14:20:10 +0200 |
| Subject: [PATCH 197/255] usb: host: xhci: reorder variable definitions |
| |
| no functional changes. Simple cleanup to make sure variables are ordered |
| in a 'reverse christmas tree' fashion. While at that, also remove an |
| obsolete comment which doesn't apply anymore. |
| |
| Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit be0f50c2e3c4bb9bd8fcb4b89879ae62308019bf) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/host/xhci-ring.c | 12 ++++-------- |
| 1 file changed, 4 insertions(+), 8 deletions(-) |
| |
| --- a/drivers/usb/host/xhci-ring.c |
| +++ b/drivers/usb/host/xhci-ring.c |
| @@ -1825,22 +1825,18 @@ int xhci_is_vendor_info_code(struct xhci |
| return 0; |
| } |
| |
| -/* |
| - * Finish the td processing, remove the td from td list; |
| - * Return 1 if the urb can be given back. |
| - */ |
| static int finish_td(struct xhci_hcd *xhci, struct xhci_td *td, |
| union xhci_trb *ep_trb, struct xhci_transfer_event *event, |
| struct xhci_virt_ep *ep, int *status, bool skip) |
| { |
| struct xhci_virt_device *xdev; |
| - struct xhci_ring *ep_ring; |
| - unsigned int slot_id; |
| - int ep_index; |
| - struct urb *urb = NULL; |
| struct xhci_ep_ctx *ep_ctx; |
| + struct xhci_ring *ep_ring; |
| struct urb_priv *urb_priv; |
| + struct urb *urb = NULL; |
| + unsigned int slot_id; |
| u32 trb_comp_code; |
| + int ep_index; |
| |
| slot_id = TRB_TO_SLOT_ID(le32_to_cpu(event->flags)); |
| xdev = xhci->devs[slot_id]; |
