aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/host/xhci-ring.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index ba551239d28b..4794905d38d7 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2182,7 +2182,6 @@ static int xhci_handle_event(struct xhci_hcd *xhci)
2182 int update_ptrs = 1; 2182 int update_ptrs = 1;
2183 int ret; 2183 int ret;
2184 2184
2185 xhci_dbg(xhci, "In %s\n", __func__);
2186 if (!xhci->event_ring || !xhci->event_ring->dequeue) { 2185 if (!xhci->event_ring || !xhci->event_ring->dequeue) {
2187 xhci->error_bitmask |= 1 << 1; 2186 xhci->error_bitmask |= 1 << 1;
2188 return 0; 2187 return 0;
@@ -2195,7 +2194,6 @@ static int xhci_handle_event(struct xhci_hcd *xhci)
2195 xhci->error_bitmask |= 1 << 2; 2194 xhci->error_bitmask |= 1 << 2;
2196 return 0; 2195 return 0;
2197 } 2196 }
2198 xhci_dbg(xhci, "%s - OS owns TRB\n", __func__);
2199 2197
2200 /* 2198 /*
2201 * Barrier between reading the TRB_CYCLE (valid) flag above and any 2199 * Barrier between reading the TRB_CYCLE (valid) flag above and any
@@ -2205,20 +2203,14 @@ static int xhci_handle_event(struct xhci_hcd *xhci)
2205 /* FIXME: Handle more event types. */ 2203 /* FIXME: Handle more event types. */
2206 switch ((le32_to_cpu(event->event_cmd.flags) & TRB_TYPE_BITMASK)) { 2204 switch ((le32_to_cpu(event->event_cmd.flags) & TRB_TYPE_BITMASK)) {
2207 case TRB_TYPE(TRB_COMPLETION): 2205 case TRB_TYPE(TRB_COMPLETION):
2208 xhci_dbg(xhci, "%s - calling handle_cmd_completion\n", __func__);
2209 handle_cmd_completion(xhci, &event->event_cmd); 2206 handle_cmd_completion(xhci, &event->event_cmd);
2210 xhci_dbg(xhci, "%s - returned from handle_cmd_completion\n", __func__);
2211 break; 2207 break;
2212 case TRB_TYPE(TRB_PORT_STATUS): 2208 case TRB_TYPE(TRB_PORT_STATUS):
2213 xhci_dbg(xhci, "%s - calling handle_port_status\n", __func__);
2214 handle_port_status(xhci, event); 2209 handle_port_status(xhci, event);
2215 xhci_dbg(xhci, "%s - returned from handle_port_status\n", __func__);
2216 update_ptrs = 0; 2210 update_ptrs = 0;
2217 break; 2211 break;
2218 case TRB_TYPE(TRB_TRANSFER): 2212 case TRB_TYPE(TRB_TRANSFER):
2219 xhci_dbg(xhci, "%s - calling handle_tx_event\n", __func__);
2220 ret = handle_tx_event(xhci, &event->trans_event); 2213 ret = handle_tx_event(xhci, &event->trans_event);
2221 xhci_dbg(xhci, "%s - returned from handle_tx_event\n", __func__);
2222 if (ret < 0) 2214 if (ret < 0)
2223 xhci->error_bitmask |= 1 << 9; 2215 xhci->error_bitmask |= 1 << 9;
2224 else 2216 else