xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xhci: rename size variable to num_tds

Browse Source 
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>
This commit is contained in:
Mathias Nyman
2017-01-23 14:20:24 +02:00
committed by Greg Kroah-Hartman
parent a711edeeb1
commit e6f7caa3de
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/usb/host/xhci.c
View File

@@ -1337,7 +1337,7 @@ int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags)
int ret = 0; int ret = 0;
unsigned int slot_id, ep_index; unsigned int slot_id, ep_index;
struct urb_priv *urb_priv; struct urb_priv *urb_priv;
int size, i; int num_tds, i;
if (!urb || xhci_check_args(hcd, urb->dev, urb->ep, if (!urb || xhci_check_args(hcd, urb->dev, urb->ep,
true, true, __func__) <= 0) true, true, __func__) <= 0)
@@ -1354,32 +1354,32 @@ int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags)
} }
if (usb_endpoint_xfer_isoc(&urb->ep->desc)) 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) && else if (usb_endpoint_is_bulk_out(&urb->ep->desc) &&
urb->transfer_buffer_length > 0 && urb->transfer_buffer_length > 0 &&
urb->transfer_flags & URB_ZERO_PACKET && urb->transfer_flags & URB_ZERO_PACKET &&
!(urb->transfer_buffer_length % usb_endpoint_maxp(&urb->ep->desc))) !(urb->transfer_buffer_length % usb_endpoint_maxp(&urb->ep->desc)))
size = 2; num_tds = 2;
else else
size = 1; num_tds = 1;
urb_priv = kzalloc(sizeof(struct urb_priv) + 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) if (!urb_priv)
return -ENOMEM; return -ENOMEM;
buffer = kzalloc(size * sizeof(struct xhci_td), mem_flags); buffer = kzalloc(num_tds * sizeof(struct xhci_td), mem_flags);
if (!buffer) { if (!buffer) {
kfree(urb_priv); kfree(urb_priv);
return -ENOMEM; return -ENOMEM;
} }
for (i = 0; i < size; i++) { for (i = 0; i < num_tds; i++) {
urb_priv->td[i] = buffer; urb_priv->td[i] = buffer;
buffer++; buffer++;
} }
urb_priv->length = size; urb_priv->length = num_tds;
urb_priv->td_cnt = 0; urb_priv->td_cnt = 0;
urb->hcpriv = urb_priv; urb->hcpriv = urb_priv;