xhci: remove xhci_stream_id_to_ring() helper

[linux-block.git] / drivers / usb / host / xhci-mem.c

diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 3589b49b6c8b4e3b0e97af64e702084bc3a3feb2..f2c4ee7c4786eb4f8f782b3c00b2d5e3a6615de2 100644 (file)
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -592,23 +592,6 @@ struct xhci_ring *xhci_dma_to_transfer_ring(
        return ep->ring;
 }
 
-struct xhci_ring *xhci_stream_id_to_ring(
-               struct xhci_virt_device *dev,
-               unsigned int ep_index,
-               unsigned int stream_id)
-{
-       struct xhci_virt_ep *ep = &dev->eps[ep_index];
-
-       if (stream_id == 0)
-               return ep->ring;
-       if (!ep->stream_info)
-               return NULL;
-
-       if (stream_id >= ep->stream_info->num_streams)
-               return NULL;
-       return ep->stream_info->stream_rings[stream_id];
-}
-
 /*
  * Change an endpoint's internal structure so it supports stream IDs.  The
  * number of requested streams includes stream 0, which cannot be used by device
@@ -994,6 +977,8 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,
        if (!dev)
                return 0;
 
+       dev->slot_id = slot_id;
+
        /* Allocate the (output) device context that will be used in the HC. */
        dev->out_ctx = xhci_alloc_container_ctx(xhci, XHCI_CTX_TYPE_DEVICE, flags);
        if (!dev->out_ctx)
@@ -1012,6 +997,8 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,
 
        /* Initialize the cancellation list and watchdog timers for each ep */
        for (i = 0; i < 31; i++) {
+               dev->eps[i].ep_index = i;
+               dev->eps[i].vdev = dev;
                xhci_init_endpoint_timer(xhci, &dev->eps[i]);
                INIT_LIST_HEAD(&dev->eps[i].cancelled_td_list);
                INIT_LIST_HEAD(&dev->eps[i].bw_endpoint_list);