| From d03f4ba30be03a65d4e55b5e432ba4c35117a91c Mon Sep 17 00:00:00 2001 |
| From: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Date: Mon, 23 Jan 2017 14:20:24 +0200 |
| Subject: [PATCH 210/255] xhci: rename size variable to num_tds |
| |
| No functinal changes. |
| num_tds describes the number of transfer descriptor better than "size" |
| |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit e6f7caa3de7a6a093e23d2722e45676a6e886e4c) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/host/xhci.c | 16 ++++++++-------- |
| 1 file changed, 8 insertions(+), 8 deletions(-) |
| |
| --- a/drivers/usb/host/xhci.c |
| +++ b/drivers/usb/host/xhci.c |
| @@ -1382,7 +1382,7 @@ int xhci_urb_enqueue(struct usb_hcd *hcd |
| int ret = 0; |
| unsigned int slot_id, ep_index; |
| struct urb_priv *urb_priv; |
| - int size, i; |
| + int num_tds, i; |
| |
| if (!urb || xhci_check_args(hcd, urb->dev, urb->ep, |
| true, true, __func__) <= 0) |
| @@ -1399,32 +1399,32 @@ int xhci_urb_enqueue(struct usb_hcd *hcd |
| } |
| |
| if (usb_endpoint_xfer_isoc(&urb->ep->desc)) |
| - size = urb->number_of_packets; |
| + num_tds = urb->number_of_packets; |
| else if (usb_endpoint_is_bulk_out(&urb->ep->desc) && |
| urb->transfer_buffer_length > 0 && |
| urb->transfer_flags & URB_ZERO_PACKET && |
| !(urb->transfer_buffer_length % usb_endpoint_maxp(&urb->ep->desc))) |
| - size = 2; |
| + num_tds = 2; |
| else |
| - size = 1; |
| + num_tds = 1; |
| |
| urb_priv = kzalloc(sizeof(struct urb_priv) + |
| - size * sizeof(struct xhci_td *), mem_flags); |
| + num_tds * sizeof(struct xhci_td *), mem_flags); |
| if (!urb_priv) |
| return -ENOMEM; |
| |
| - buffer = kzalloc(size * sizeof(struct xhci_td), mem_flags); |
| + buffer = kzalloc(num_tds * sizeof(struct xhci_td), mem_flags); |
| if (!buffer) { |
| kfree(urb_priv); |
| return -ENOMEM; |
| } |
| |
| - for (i = 0; i < size; i++) { |
| + for (i = 0; i < num_tds; i++) { |
| urb_priv->td[i] = buffer; |
| buffer++; |
| } |
| |
| - urb_priv->length = size; |
| + urb_priv->length = num_tds; |
| urb_priv->td_cnt = 0; |
| urb->hcpriv = urb_priv; |
| |