---

yaml --- r: 151421 b: refs/heads/master c: b7258a4 h: refs/heads/master i: 151419: f9f4959 v: v3
git-mirror · Jun 16, 2009 · 4f0eb7a · 4f0eb7a
1 parent 9135257
commit 4f0eb7a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae636747146ea97efa18e04576acd3416e2514f5
+refs/heads/master: b7258a4aba2b24d5c27a0f6674795e83e7771969
diff --git a/trunk/drivers/usb/host/xhci-hcd.c b/trunk/drivers/usb/host/xhci-hcd.c
@@ -246,7 +246,7 @@ static void xhci_work(struct xhci_hcd *xhci)
 	xhci_readl(xhci, &xhci->ir_set->irq_pending);
 
 	/* FIXME this should be a delayed service routine that clears the EHB */
-	handle_event(xhci);
+	xhci_handle_event(xhci);
 
 	/* Clear the event handler busy flag; the event ring should be empty. */
 	temp = xhci_readl(xhci, &xhci->ir_set->erst_dequeue[0]);

diff --git a/trunk/drivers/usb/host/xhci-ring.c b/trunk/drivers/usb/host/xhci-ring.c
@@ -1009,7 +1009,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
  * This function handles all OS-owned events on the event ring.  It may drop
  * xhci->lock between event processing (e.g. to pass up port status changes).
  */
-void handle_event(struct xhci_hcd *xhci)
+void xhci_handle_event(struct xhci_hcd *xhci)
 {
 	union xhci_trb *event;
 	int update_ptrs = 1;
@@ -1054,7 +1054,7 @@ void handle_event(struct xhci_hcd *xhci)
 		set_hc_event_deq(xhci);
 	}
 	/* Are there more items on the event ring? */
-	handle_event(xhci);
+	xhci_handle_event(xhci);
 }
 
 /****		Endpoint Ring Operations	****/

diff --git a/trunk/drivers/usb/host/xhci.h b/trunk/drivers/usb/host/xhci.h
@@ -1132,7 +1132,7 @@ void xhci_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev);
 dma_addr_t trb_virt_to_dma(struct xhci_segment *seg, union xhci_trb *trb);
 void ring_cmd_db(struct xhci_hcd *xhci);
 void *setup_one_noop(struct xhci_hcd *xhci);
-void handle_event(struct xhci_hcd *xhci);
+void xhci_handle_event(struct xhci_hcd *xhci);
 void set_hc_event_deq(struct xhci_hcd *xhci);
 int queue_slot_control(struct xhci_hcd *xhci, u32 trb_type, u32 slot_id);
 int queue_address_device(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr, u32 slot_id);