xhci:prevent "callbacks suppressed" when debug is not enabled
authorDmitry Kasatkin <d.kasatkin@samsung.com>
Tue, 27 Aug 2013 14:47:35 +0000 (17:47 +0300)
committerSarah Sharp <sarah.a.sharp@linux.intel.com>
Tue, 27 Aug 2013 15:56:31 +0000 (08:56 -0700)
When debug is not enabled and dev_dbg() will expand to nothing,
log might be flooded with "callbacks suppressed". If it was not
done on purpose, better to use dev_dbg_ratelimited() instead.

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
drivers/usb/host/xhci-ring.c

index 7b35af1..411da1f 100644 (file)
@@ -3087,14 +3087,10 @@ int xhci_queue_intr_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
         * to set the polling interval (once the API is added).
         */
        if (xhci_interval != ep_interval) {
-               if (printk_ratelimit())
-                       dev_dbg(&urb->dev->dev, "Driver uses different interval"
-                                       " (%d microframe%s) than xHCI "
-                                       "(%d microframe%s)\n",
-                                       ep_interval,
-                                       ep_interval == 1 ? "" : "s",
-                                       xhci_interval,
-                                       xhci_interval == 1 ? "" : "s");
+               dev_dbg_ratelimited(&urb->dev->dev,
+                               "Driver uses different interval (%d microframe%s) than xHCI (%d microframe%s)\n",
+                               ep_interval, ep_interval == 1 ? "" : "s",
+                               xhci_interval, xhci_interval == 1 ? "" : "s");
                urb->interval = xhci_interval;
                /* Convert back to frames for LS/FS devices */
                if (urb->dev->speed == USB_SPEED_LOW ||
@@ -3876,14 +3872,10 @@ int xhci_queue_isoc_tx_prepare(struct xhci_hcd *xhci, gfp_t mem_flags,
         * to set the polling interval (once the API is added).
         */
        if (xhci_interval != ep_interval) {
-               if (printk_ratelimit())
-                       dev_dbg(&urb->dev->dev, "Driver uses different interval"
-                                       " (%d microframe%s) than xHCI "
-                                       "(%d microframe%s)\n",
-                                       ep_interval,
-                                       ep_interval == 1 ? "" : "s",
-                                       xhci_interval,
-                                       xhci_interval == 1 ? "" : "s");
+               dev_dbg_ratelimited(&urb->dev->dev,
+                               "Driver uses different interval (%d microframe%s) than xHCI (%d microframe%s)\n",
+                               ep_interval, ep_interval == 1 ? "" : "s",
+                               xhci_interval, xhci_interval == 1 ? "" : "s");
                urb->interval = xhci_interval;
                /* Convert back to frames for LS/FS devices */
                if (urb->dev->speed == USB_SPEED_LOW ||