USB: EHCI: don't refcount QHs

This patch (as1567) removes ehci-hcd's reference counting of QH
structures.  It's not necessary to refcount these things because they
always get deallocated at exactly one spot in ehci_endpoint_disable()
(except for two special QHs, ehci->async and ehci->dummy) and are
never used again.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 9 deletions

diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 4378bf72bbac..7d117bbffac1 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -265,7 +265,6 @@ __acquires(ehci->lock)
                         /* ... update hc-wide periodic stats (for usbfs) */
                         ehci_to_hcd(ehci)->self.bandwidth_int_reqs--;
                 }
-                qh_put (qh);
         }
 
         if (unlikely(urb->unlinked)) {
@@ -946,7 +945,7 @@ qh_make (
                 ehci_dbg(ehci, "bogus dev %p speed %d\n", urb->dev,
                         urb->dev->speed);
 done:
-                qh_put (qh);
+                qh_destroy(ehci, qh);
                 return NULL;
         }
 
@@ -1003,7 +1002,6 @@ static void qh_link_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
         head->qh_next.qh = qh;
         head->hw->hw_next = dma;
 
-        qh_get(qh);
         qh->xacterrs = 0;
         qh->qh_state = QH_STATE_LINKED;
         /* qtd completions reported later by interrupt */
@@ -1090,7 +1088,7 @@ static struct ehci_qh *qh_append_tds (
                         wmb ();
                         dummy->hw_token = token;
 
-                        urb->hcpriv = qh_get (qh);
+                        urb->hcpriv = qh;
                 }
         }
         return qh;
@@ -1167,7 +1165,6 @@ static void end_unlink_async (struct ehci_hcd *ehci)
         // qh->hw_next = cpu_to_hc32(qh->qh_dma);
         qh->qh_state = QH_STATE_IDLE;
         qh->qh_next.qh = NULL;
-        qh_put (qh);                    // refcount from reclaim
 
         /* other unlink(s) may be pending (in QH_STATE_UNLINK_WAIT) */
         next = qh->reclaim;
@@ -1186,7 +1183,6 @@ static void end_unlink_async (struct ehci_hcd *ehci)
                                 && ehci->async->qh_next.qh == NULL)
                         timer_action (ehci, TIMER_ASYNC_OFF);
         }
-        qh_put(qh);                     /* refcount from async list */
 
         if (next) {
                 ehci->reclaim = NULL;
@@ -1230,7 +1226,7 @@ static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
         }
 
         qh->qh_state = QH_STATE_UNLINK;
-        ehci->reclaim = qh = qh_get (qh);
+        ehci->reclaim = qh;
 
         prev = ehci->async;
         while (prev->qh_next.qh != qh)
@@ -1283,12 +1279,10 @@ static void scan_async (struct ehci_hcd *ehci)
                          * gets unlinked then ehci->qh_scan_next is adjusted
                          * in start_unlink_async().
                          */
-                        qh = qh_get(qh);
                         temp = qh_completions(ehci, qh);
                         if (qh->needs_rescan)
                                 unlink_async(ehci, qh);
                         qh->unlink_time = jiffies + EHCI_SHRINK_JIFFIES;
-                        qh_put(qh);
                         if (temp != 0)
                                 goto rescan;
                 }