Skip to content

Commit

Permalink
xhci - clarify compliance mode debug messages
Browse files Browse the repository at this point in the history
There are no functional changes in this patch. However, because the
compliance mode timer can be deleted in more than one function, it
seemed expedient to include the function name in the debug strings.

Also limited the use of capitals to the first word in the compliance
mode debug messages, except after a function name where all words
start with lower case, in keeping with the style prevalent elsewhere
in xhci.c.

Signed-off-by: Tony Camuso <tcamuso@redhat.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
  • Loading branch information
Tony Camuso authored and Sarah Sharp committed Apr 8, 2013
1 parent eb8ccd2 commit 58b1d79
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions drivers/usb/host/xhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -417,9 +417,9 @@ static void compliance_mode_recovery(unsigned long arg)
* Compliance Mode Detected. Letting USB Core
* handle the Warm Reset
*/
xhci_dbg(xhci, "Compliance Mode Detected->Port %d!\n",
xhci_dbg(xhci, "Compliance mode detected->port %d\n",
i + 1);
xhci_dbg(xhci, "Attempting Recovery routine!\n");
xhci_dbg(xhci, "Attempting compliance mode recovery\n");
hcd = xhci->shared_hcd;

if (hcd->state == HC_STATE_SUSPENDED)
Expand Down Expand Up @@ -457,7 +457,7 @@ static void compliance_mode_recovery_timer_init(struct xhci_hcd *xhci)
set_timer_slack(&xhci->comp_mode_recovery_timer,
msecs_to_jiffies(COMP_MODE_RCVRY_MSECS));
add_timer(&xhci->comp_mode_recovery_timer);
xhci_dbg(xhci, "Compliance Mode Recovery Timer Initialized.\n");
xhci_dbg(xhci, "Compliance mode recovery timer initialized\n");
}

/*
Expand Down Expand Up @@ -733,8 +733,11 @@ void xhci_stop(struct usb_hcd *hcd)

/* Deleting Compliance Mode Recovery Timer */
if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) &&
(!(xhci_all_ports_seen_u0(xhci))))
(!(xhci_all_ports_seen_u0(xhci)))) {
del_timer_sync(&xhci->comp_mode_recovery_timer);
xhci_dbg(xhci, "%s: compliance mode recovery timer deleted\n",
__func__);
}

if (xhci->quirks & XHCI_AMD_PLL_FIX)
usb_amd_dev_put();
Expand Down Expand Up @@ -930,7 +933,8 @@ int xhci_suspend(struct xhci_hcd *xhci)
if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) &&
(!(xhci_all_ports_seen_u0(xhci)))) {
del_timer_sync(&xhci->comp_mode_recovery_timer);
xhci_dbg(xhci, "Compliance Mode Recovery Timer Deleted!\n");
xhci_dbg(xhci, "%s: compliance mode recovery timer deleted\n",
__func__);
}

/* step 5: remove core well power */
Expand Down

0 comments on commit 58b1d79

Please sign in to comment.