diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/xhci-hcd.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/xhci-ring.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/xhci.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/xhci-hcd.c b/drivers/usb/host/xhci-hcd.c index 36e440ce88e5..197e6bb5b93d 100644 --- a/drivers/usb/host/xhci-hcd.c +++ b/drivers/usb/host/xhci-hcd.c | |||
@@ -246,7 +246,7 @@ static void xhci_work(struct xhci_hcd *xhci) | |||
246 | xhci_readl(xhci, &xhci->ir_set->irq_pending); | 246 | xhci_readl(xhci, &xhci->ir_set->irq_pending); |
247 | 247 | ||
248 | /* FIXME this should be a delayed service routine that clears the EHB */ | 248 | /* FIXME this should be a delayed service routine that clears the EHB */ |
249 | handle_event(xhci); | 249 | xhci_handle_event(xhci); |
250 | 250 | ||
251 | /* Clear the event handler busy flag; the event ring should be empty. */ | 251 | /* Clear the event handler busy flag; the event ring should be empty. */ |
252 | temp = xhci_readl(xhci, &xhci->ir_set->erst_dequeue[0]); | 252 | temp = xhci_readl(xhci, &xhci->ir_set->erst_dequeue[0]); |
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index f967a6df83c7..1feca20612d1 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
@@ -1009,7 +1009,7 @@ cleanup: | |||
1009 | * This function handles all OS-owned events on the event ring. It may drop | 1009 | * This function handles all OS-owned events on the event ring. It may drop |
1010 | * xhci->lock between event processing (e.g. to pass up port status changes). | 1010 | * xhci->lock between event processing (e.g. to pass up port status changes). |
1011 | */ | 1011 | */ |
1012 | void handle_event(struct xhci_hcd *xhci) | 1012 | void xhci_handle_event(struct xhci_hcd *xhci) |
1013 | { | 1013 | { |
1014 | union xhci_trb *event; | 1014 | union xhci_trb *event; |
1015 | int update_ptrs = 1; | 1015 | int update_ptrs = 1; |
@@ -1054,7 +1054,7 @@ void handle_event(struct xhci_hcd *xhci) | |||
1054 | set_hc_event_deq(xhci); | 1054 | set_hc_event_deq(xhci); |
1055 | } | 1055 | } |
1056 | /* Are there more items on the event ring? */ | 1056 | /* Are there more items on the event ring? */ |
1057 | handle_event(xhci); | 1057 | xhci_handle_event(xhci); |
1058 | } | 1058 | } |
1059 | 1059 | ||
1060 | /**** Endpoint Ring Operations ****/ | 1060 | /**** Endpoint Ring Operations ****/ |
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 7b7103405c69..e57a609e381d 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h | |||
@@ -1132,7 +1132,7 @@ void xhci_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev); | |||
1132 | dma_addr_t trb_virt_to_dma(struct xhci_segment *seg, union xhci_trb *trb); | 1132 | dma_addr_t trb_virt_to_dma(struct xhci_segment *seg, union xhci_trb *trb); |
1133 | void ring_cmd_db(struct xhci_hcd *xhci); | 1133 | void ring_cmd_db(struct xhci_hcd *xhci); |
1134 | void *setup_one_noop(struct xhci_hcd *xhci); | 1134 | void *setup_one_noop(struct xhci_hcd *xhci); |
1135 | void handle_event(struct xhci_hcd *xhci); | 1135 | void xhci_handle_event(struct xhci_hcd *xhci); |
1136 | void set_hc_event_deq(struct xhci_hcd *xhci); | 1136 | void set_hc_event_deq(struct xhci_hcd *xhci); |
1137 | int queue_slot_control(struct xhci_hcd *xhci, u32 trb_type, u32 slot_id); | 1137 | int queue_slot_control(struct xhci_hcd *xhci, u32 trb_type, u32 slot_id); |
1138 | int queue_address_device(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr, u32 slot_id); | 1138 | int queue_address_device(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr, u32 slot_id); |