ehci: remove ehci_vdbg() verbose debugging statements

This patch removes ehci_vdbg debugging statements from EHCI host controller
driver because they produce too much information, lowering the signal to noise
ratio when debugging, and because they are not used anymore.

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

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 3bf9f482710c1574999b3ad340c9a2e21ed19d32..835fc0844a666ba545a966566f4c5fe302548370 100644 (file)
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -211,8 +211,6 @@ static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
                        else
                                t2 |= PORT_WKOC_E | PORT_WKCONN_E;
                }
-               ehci_vdbg(ehci, "port %d, %08x -> %08x\n",
-                               port + 1, t1, t2);
                ehci_writel(ehci, t2, reg);
        }
 
@@ -302,8 +300,6 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
                }
 
                if (t1 != t2) {
-                       ehci_vdbg (ehci, "port %d, %08x -> %08x\n",
-                               port + 1, t1, t2);
                        ehci_writel(ehci, t2, reg);
                        changed = 1;
                }
@@ -483,7 +479,6 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
                if (test_bit(i, &resume_needed)) {
                        temp &= ~(PORT_RWC_BITS | PORT_SUSPEND | PORT_RESUME);
                        ehci_writel(ehci, temp, &ehci->regs->port_status [i]);
-                       ehci_vdbg (ehci, "resumed port %d\n", i + 1);
                }
        }
 
@@ -1204,7 +1199,6 @@ static int ehci_hub_control (
                                        wIndex + 1);
                                temp |= PORT_OWNER;
                        } else {
-                               ehci_vdbg (ehci, "port %d reset\n", wIndex + 1);
                                temp |= PORT_RESET;
                                temp &= ~PORT_PE;
 

diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 33336874c47bc023792a89ce224d3a7a6bb37209..cf9f2fb78ff27188db9653fb2e042712ad9c4723 100644 (file)
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -240,13 +240,6 @@ static int qtd_copy_status (
                } else {        /* unknown */
                        status = -EPROTO;
                }
-
-               ehci_vdbg (ehci,
-                       "dev%d ep%d%s qtd token %08x --> status %d\n",
-                       usb_pipedevice (urb->pipe),
-                       usb_pipeendpoint (urb->pipe),
-                       usb_pipein (urb->pipe) ? "in" : "out",
-                       token, status);
        }
 
        return status;

diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index 66310894ad977b336820a8d3a7f37b5fbdaa38f7..833c35caf501b05f657fe2aa73ba74192981a6cc 100644 (file)
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -327,17 +327,8 @@ static int tt_available (
 
                periodic_tt_usecs (ehci, dev, frame, tt_usecs);
 
-               ehci_vdbg(ehci, "tt frame %d check %d usecs start uframe %d in"
-                       " schedule %d/%d/%d/%d/%d/%d/%d/%d\n",
-                       frame, usecs, uframe,
-                       tt_usecs[0], tt_usecs[1], tt_usecs[2], tt_usecs[3],
-                       tt_usecs[4], tt_usecs[5], tt_usecs[6], tt_usecs[7]);
-
-               if (max_tt_usecs[uframe] <= tt_usecs[uframe]) {
-                       ehci_vdbg(ehci, "frame %d uframe %d fully scheduled\n",
-                               frame, uframe);
+               if (max_tt_usecs[uframe] <= tt_usecs[uframe])
                        return 0;
-               }
 
                /* special case for isoc transfers larger than 125us:
                 * the first and each subsequent fully used uframe
@@ -348,13 +339,8 @@ static int tt_available (
                        int ufs = (usecs / 125);
                        int i;
                        for (i = uframe; i < (uframe + ufs) && i < 8; i++)
-                               if (0 < tt_usecs[i]) {
-                                       ehci_vdbg(ehci,
-                                               "multi-uframe xfer can't fit "
-                                               "in frame %d uframe %d\n",
-                                               frame, i);
+                               if (0 < tt_usecs[i])
                                        return 0;
-                               }
                }
 
                tt_usecs[uframe] += usecs;
@@ -362,12 +348,8 @@ static int tt_available (
                carryover_tt_bandwidth(tt_usecs);
 
                /* fail if the carryover pushed bw past the last uframe's limit */
-               if (max_tt_usecs[7] < tt_usecs[7]) {
-                       ehci_vdbg(ehci,
-                               "tt unavailable usecs %d frame %d uframe %d\n",
-                               usecs, frame, uframe);
+               if (max_tt_usecs[7] < tt_usecs[7])
                        return 0;
-               }
        }
 
        return 1;
@@ -1616,16 +1598,9 @@ static void itd_link_urb(
 
        next_uframe = stream->next_uframe & (mod - 1);
 
-       if (unlikely (list_empty(&stream->td_list))) {
+       if (unlikely (list_empty(&stream->td_list)))
                ehci_to_hcd(ehci)->self.bandwidth_allocated
                                += stream->bandwidth;
-               ehci_vdbg (ehci,
-                       "schedule devp %s ep%d%s-iso period %d start %d.%d\n",
-                       urb->dev->devpath, stream->bEndpointAddress & 0x0f,
-                       (stream->bEndpointAddress & USB_DIR_IN) ? "in" : "out",
-                       urb->interval,
-                       next_uframe >> 3, next_uframe & 0x7);
-       }
 
        if (ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs == 0) {
                if (ehci->amd_pll_fix == 1)
@@ -1760,14 +1735,9 @@ static bool itd_complete(struct ehci_hcd *ehci, struct ehci_itd *itd)
                        usb_amd_quirk_pll_enable();
        }
 
-       if (unlikely(list_is_singular(&stream->td_list))) {
+       if (unlikely(list_is_singular(&stream->td_list)))
                ehci_to_hcd(ehci)->self.bandwidth_allocated
                                -= stream->bandwidth;
-               ehci_vdbg (ehci,
-                       "deschedule devp %s ep%d%s-iso\n",
-                       dev->devpath, stream->bEndpointAddress & 0x0f,
-                       (stream->bEndpointAddress & USB_DIR_IN) ? "in" : "out");
-       }
 
 done:
        itd->urb = NULL;
@@ -2025,17 +1995,10 @@ static void sitd_link_urb(
 
        next_uframe = stream->next_uframe;
 
-       if (list_empty(&stream->td_list)) {
+       if (list_empty(&stream->td_list))
                /* usbfs ignores TT bandwidth */
                ehci_to_hcd(ehci)->self.bandwidth_allocated
                                += stream->bandwidth;
-               ehci_vdbg (ehci,
-                       "sched devp %s ep%d%s-iso [%d] %dms/%04x\n",
-                       urb->dev->devpath, stream->bEndpointAddress & 0x0f,
-                       (stream->bEndpointAddress & USB_DIR_IN) ? "in" : "out",
-                       (next_uframe >> 3) & (ehci->periodic_size - 1),
-                       stream->interval, hc32_to_cpu(ehci, stream->splits));
-       }
 
        if (ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs == 0) {
                if (ehci->amd_pll_fix == 1)
@@ -2149,14 +2112,9 @@ static bool sitd_complete(struct ehci_hcd *ehci, struct ehci_sitd *sitd)
                        usb_amd_quirk_pll_enable();
        }
 
-       if (list_is_singular(&stream->td_list)) {
+       if (list_is_singular(&stream->td_list))
                ehci_to_hcd(ehci)->self.bandwidth_allocated
                                -= stream->bandwidth;
-               ehci_vdbg (ehci,
-                       "deschedule devp %s ep%d%s-iso\n",
-                       dev->devpath, stream->bEndpointAddress & 0x0f,
-                       (stream->bEndpointAddress & USB_DIR_IN) ? "in" : "out");
-       }
 
 done:
        sitd->urb = NULL;

diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 2822e79e1fbcf7feb9ab5efd5af70a8f2e64a27f..6067d4bcc0373913e451c6e5a5504f0aa1010df9 100644 (file)
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -782,11 +782,6 @@ static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x)
 #define ehci_warn(ehci, fmt, args...) \
        dev_warn(ehci_to_hcd(ehci)->self.controller , fmt , ## args)
 
-#ifdef VERBOSE_DEBUG
-#      define ehci_vdbg ehci_dbg
-#else
-       static inline void ehci_vdbg(struct ehci_hcd *ehci, ...) {}
-#endif
 
 #ifndef DEBUG
 #define STUB_DEBUG_FILES