aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorAndiry Xu <andiry.xu@amd.com>2011-01-04 19:30:39 -0500
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2011-01-14 18:51:54 -0500
commite1eab2e00015bfe48388920ff287efdbefb6af24 (patch)
treed2f6bb672c47717c41e8d67866686f7a0bd3f75a /drivers/usb
parent47cbf6925cd0ef8af4b8165b43a60b5f37c36d8a (diff)
xHCI: remove redundant parameter in giveback_first_trb()
Parameter *td is not used in giveback_first_trb(). Remove it. Signed-off-by: Andiry Xu <andiry.xu@amd.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/xhci-ring.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 55dc1567506..59f81b56048 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2414,7 +2414,7 @@ static void check_trb_math(struct urb *urb, int num_trbs, int running_total)
2414 2414
2415static void giveback_first_trb(struct xhci_hcd *xhci, int slot_id, 2415static void giveback_first_trb(struct xhci_hcd *xhci, int slot_id,
2416 unsigned int ep_index, unsigned int stream_id, int start_cycle, 2416 unsigned int ep_index, unsigned int stream_id, int start_cycle,
2417 struct xhci_generic_trb *start_trb, struct xhci_td *td) 2417 struct xhci_generic_trb *start_trb)
2418{ 2418{
2419 /* 2419 /*
2420 * Pass all the TRBs to the hardware at once and make sure this write 2420 * Pass all the TRBs to the hardware at once and make sure this write
@@ -2625,7 +2625,7 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
2625 2625
2626 check_trb_math(urb, num_trbs, running_total); 2626 check_trb_math(urb, num_trbs, running_total);
2627 giveback_first_trb(xhci, slot_id, ep_index, urb->stream_id, 2627 giveback_first_trb(xhci, slot_id, ep_index, urb->stream_id,
2628 start_cycle, start_trb, td); 2628 start_cycle, start_trb);
2629 return 0; 2629 return 0;
2630} 2630}
2631 2631
@@ -2757,7 +2757,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
2757 2757
2758 check_trb_math(urb, num_trbs, running_total); 2758 check_trb_math(urb, num_trbs, running_total);
2759 giveback_first_trb(xhci, slot_id, ep_index, urb->stream_id, 2759 giveback_first_trb(xhci, slot_id, ep_index, urb->stream_id,
2760 start_cycle, start_trb, td); 2760 start_cycle, start_trb);
2761 return 0; 2761 return 0;
2762} 2762}
2763 2763
@@ -2859,7 +2859,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
2859 field | TRB_IOC | TRB_TYPE(TRB_STATUS) | ep_ring->cycle_state); 2859 field | TRB_IOC | TRB_TYPE(TRB_STATUS) | ep_ring->cycle_state);
2860 2860
2861 giveback_first_trb(xhci, slot_id, ep_index, 0, 2861 giveback_first_trb(xhci, slot_id, ep_index, 0,
2862 start_cycle, start_trb, td); 2862 start_cycle, start_trb);
2863 return 0; 2863 return 0;
2864} 2864}
2865 2865
@@ -3006,10 +3006,8 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
3006 } 3006 }
3007 } 3007 }
3008 3008
3009 wmb(); 3009 giveback_first_trb(xhci, slot_id, ep_index, urb->stream_id,
3010 start_trb->field[3] |= start_cycle; 3010 start_cycle, start_trb);
3011
3012 xhci_ring_ep_doorbell(xhci, slot_id, ep_index, urb->stream_id);
3013 return 0; 3011 return 0;
3014} 3012}
3015 3013