diff options
| author | Dmitry Kasatkin <d.kasatkin@samsung.com> | 2013-08-27 10:47:35 -0400 |
|---|---|---|
| committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2013-08-27 11:56:31 -0400 |
| commit | 0730d52a86919300a39a2be37f6c140997dfb82f (patch) | |
| tree | 979f7565e78c3afbefdfcebea40a8aab354673c6 /drivers/usb/host | |
| parent | dcf06a036848b4e8e6c8220f2e00b9adf6f84918 (diff) | |
xhci:prevent "callbacks suppressed" when debug is not enabled
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>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 7b35af167e55..411da1fc7ae8 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
| @@ -3087,14 +3087,10 @@ int xhci_queue_intr_tx(struct xhci_hcd *xhci, gfp_t mem_flags, | |||
| 3087 | * to set the polling interval (once the API is added). | 3087 | * to set the polling interval (once the API is added). |
| 3088 | */ | 3088 | */ |
| 3089 | if (xhci_interval != ep_interval) { | 3089 | if (xhci_interval != ep_interval) { |
| 3090 | if (printk_ratelimit()) | 3090 | dev_dbg_ratelimited(&urb->dev->dev, |
| 3091 | dev_dbg(&urb->dev->dev, "Driver uses different interval" | 3091 | "Driver uses different interval (%d microframe%s) than xHCI (%d microframe%s)\n", |
| 3092 | " (%d microframe%s) than xHCI " | 3092 | ep_interval, ep_interval == 1 ? "" : "s", |
| 3093 | "(%d microframe%s)\n", | 3093 | xhci_interval, xhci_interval == 1 ? "" : "s"); |
| 3094 | ep_interval, | ||
| 3095 | ep_interval == 1 ? "" : "s", | ||
| 3096 | xhci_interval, | ||
| 3097 | xhci_interval == 1 ? "" : "s"); | ||
| 3098 | urb->interval = xhci_interval; | 3094 | urb->interval = xhci_interval; |
| 3099 | /* Convert back to frames for LS/FS devices */ | 3095 | /* Convert back to frames for LS/FS devices */ |
| 3100 | if (urb->dev->speed == USB_SPEED_LOW || | 3096 | 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, | |||
| 3876 | * to set the polling interval (once the API is added). | 3872 | * to set the polling interval (once the API is added). |
| 3877 | */ | 3873 | */ |
| 3878 | if (xhci_interval != ep_interval) { | 3874 | if (xhci_interval != ep_interval) { |
| 3879 | if (printk_ratelimit()) | 3875 | dev_dbg_ratelimited(&urb->dev->dev, |
| 3880 | dev_dbg(&urb->dev->dev, "Driver uses different interval" | 3876 | "Driver uses different interval (%d microframe%s) than xHCI (%d microframe%s)\n", |
| 3881 | " (%d microframe%s) than xHCI " | 3877 | ep_interval, ep_interval == 1 ? "" : "s", |
| 3882 | "(%d microframe%s)\n", | 3878 | xhci_interval, xhci_interval == 1 ? "" : "s"); |
| 3883 | ep_interval, | ||
| 3884 | ep_interval == 1 ? "" : "s", | ||
| 3885 | xhci_interval, | ||
| 3886 | xhci_interval == 1 ? "" : "s"); | ||
| 3887 | urb->interval = xhci_interval; | 3879 | urb->interval = xhci_interval; |
| 3888 | /* Convert back to frames for LS/FS devices */ | 3880 | /* Convert back to frames for LS/FS devices */ |
| 3889 | if (urb->dev->speed == USB_SPEED_LOW || | 3881 | if (urb->dev->speed == USB_SPEED_LOW || |