Commit 38a532a6 authored by Xenia Ragiadakou's avatar Xenia Ragiadakou Committed by Sarah Sharp
Browse files

xhci: replace xhci_info() with xhci_dbg() 



This patch replaces the calls to xhci_info() with calls to
xhci_dbg() and removes the unused xhci_info() definition
from xhci-hcd.

By replacing the xhci_info() with xhci_dbg(), the calls to
dev_info() are replaced with calls to dev_dbg() so that
their output can be dynamically controlled via the dynamic
debugging mechanism.

Signed-off-by: default avatarXenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent 1fe6c452

drivers/usb/host/xhci.c

+2 −2
Original line number Diff line number Diff line
@@ -3508,10 +3508,10 @@ int xhci_discover_or_reset_device(struct usb_hcd *hcd, struct usb_device *udev) 
	switch (ret) {

	case COMP_EBADSLT: /* 0.95 completion code for bad slot ID */

	case COMP_CTX_STATE: /* 0.96 completion code for same thing */

		xhci_info(xhci, "Can't reset device (slot ID %u) in %s state\n",

		xhci_dbg(xhci, "Can't reset device (slot ID %u) in %s state\n",

				slot_id,

				xhci_get_slot_state(xhci, virt_dev->out_ctx));

		xhci_info(xhci, "Not freeing device rings.\n");

		xhci_dbg(xhci, "Not freeing device rings.\n");

		/* Don't treat this as an error.  May change my mind later. */

		ret = 0;

		goto command_cleanup;

drivers/usb/host/xhci.h

+0 −2
Original line number Diff line number Diff line
@@ -1587,8 +1587,6 @@ static inline struct usb_hcd *xhci_to_hcd(struct xhci_hcd *xhci) 


#define xhci_dbg(xhci, fmt, args...) \

	do { if (XHCI_DEBUG) dev_dbg(xhci_to_hcd(xhci)->self.controller , fmt , ## args); } while (0)

#define xhci_info(xhci, fmt, args...) \

	do { if (XHCI_DEBUG) dev_info(xhci_to_hcd(xhci)->self.controller , fmt , ## args); } while (0)

#define xhci_err(xhci, fmt, args...) \

	dev_err(xhci_to_hcd(xhci)->self.controller , fmt , ## args)

#define xhci_warn(xhci, fmt, args...) \

CRA Git | Maintained and supported by SUSTech CRA and CCSE