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

Commit 9ef7fbbb authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: Rename variables related to transfer descritpors 



urb_priv structure has a count on how many TDs the
URB contains, and how many of those TD's we have handled.

rename:
length -> num_tds
td_cnt -> num_tds_done

No functional changes

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

drivers/usb/host/xhci-ring.c

+5 −5
Original line number Diff line number Diff line
@@ -119,14 +119,14 @@ static bool last_td_in_urb(struct xhci_td *td) 
{

	struct urb_priv *urb_priv = td->urb->hcpriv;



	return urb_priv->td_cnt == urb_priv->length;

	return urb_priv->num_tds_done == urb_priv->num_tds;

}



static void inc_td_cnt(struct urb *urb)

{

	struct urb_priv *urb_priv = urb->hcpriv;



	urb_priv->td_cnt++;

	urb_priv->num_tds_done++;

}



static void trb_to_noop(union xhci_trb *trb, u32 noop_type)
@@ -2055,7 +2055,7 @@ static int process_isoc_td(struct xhci_hcd *xhci, struct xhci_td *td, 
	ep_ring = xhci_dma_to_transfer_ring(ep, le64_to_cpu(event->buffer));

	trb_comp_code = GET_COMP_CODE(le32_to_cpu(event->transfer_len));

	urb_priv = td->urb->hcpriv;

	idx = urb_priv->td_cnt;

	idx = urb_priv->num_tds_done;

	frame = &td->urb->iso_frame_desc[idx];

	requested = frame->length;

	remaining = EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
@@ -2134,7 +2134,7 @@ static int skip_isoc_td(struct xhci_hcd *xhci, struct xhci_td *td, 


	ep_ring = xhci_dma_to_transfer_ring(ep, le64_to_cpu(event->buffer));

	urb_priv = td->urb->hcpriv;

	idx = urb_priv->td_cnt;

	idx = urb_priv->num_tds_done;

	frame = &td->urb->iso_frame_desc[idx];



	/* The transfer is partly done. */
@@ -3131,7 +3131,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, 
	urb_priv = urb->hcpriv;



	/* Deal with URB_ZERO_PACKET - need one more td/trb */

	if (urb->transfer_flags & URB_ZERO_PACKET && urb_priv->length > 1)

	if (urb->transfer_flags & URB_ZERO_PACKET && urb_priv->num_tds > 1)

		need_zero_pkt = true;



	td = urb_priv->td[0];

drivers/usb/host/xhci.c

+7 −7
Original line number Diff line number Diff line
@@ -1379,8 +1379,8 @@ int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags) 
		buffer++;

	}



	urb_priv->length = num_tds;

	urb_priv->td_cnt = 0;

	urb_priv->num_tds = num_tds;

	urb_priv->num_tds_done = 0;

	urb->hcpriv = urb_priv;



	trace_xhci_urb_enqueue(urb);
@@ -1523,8 +1523,8 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) 
		xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,

				"HW died, freeing TD.");

		urb_priv = urb->hcpriv;

		for (i = urb_priv->td_cnt;

		     i < urb_priv->length && xhci->devs[urb->dev->slot_id];

		for (i = urb_priv->num_tds_done;

		     i < urb_priv->num_tds && xhci->devs[urb->dev->slot_id];

		     i++) {

			td = urb_priv->td[i];

			if (!list_empty(&td->td_list))
@@ -1549,8 +1549,8 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) 
	}



	urb_priv = urb->hcpriv;

	i = urb_priv->td_cnt;

	if (i < urb_priv->length)

	i = urb_priv->num_tds_done;

	if (i < urb_priv->num_tds)

		xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,

				"Cancel URB %p, dev %s, ep 0x%x, "

				"starting at offset 0x%llx",
@@ -1560,7 +1560,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) 
					urb_priv->td[i]->start_seg,

					urb_priv->td[i]->first_trb));



	for (; i < urb_priv->length; i++) {

	for (; i < urb_priv->num_tds; i++) {

		td = urb_priv->td[i];

		list_add_tail(&td->cancelled_td_list, &ep->cancelled_td_list);

	}

drivers/usb/host/xhci.h

+2 −2
Original line number Diff line number Diff line
@@ -1608,8 +1608,8 @@ struct xhci_scratchpad { 
};



struct urb_priv {

	int	length;

	int	td_cnt;

	int	num_tds;

	int	num_tds_done;

	struct	xhci_td	*td[0];

};