Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0730d52a authored by Dmitry Kasatkin's avatar Dmitry Kasatkin Committed by Sarah Sharp
Browse files

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: default avatarDmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent dcf06a03

drivers/usb/host/xhci-ring.c

+8 −16
Original line number Diff line number Diff line
@@ -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 ||