On Mon, Feb 18, 2013 at 01:59:23PM -0500, Tony Camuso wrote: > The difference between v2 and v3 of this patch was mostly cosmetic. > > (!(xhci_all_ports_seen_u0(xhci)) > ... was changed to... > !(xhci_all_ports_seen_u0(xhci)) > > And ... > "Compliance Mode Recovery Timer Deleted!\n" > ... was changed to ... > "Compliance Mode Recovery Timer deleted!\n" Hi Tony, Please ignore Sergei's nit-picky comments about extra parenthesis. I'm fine with extra parens if they add to readability, either for me or for the patch submitter. It's not like parens are a precisions resource. Sergei, please stop sending non-constructive feedback on xHCI driver patches. It adds unnecessary patch churn. In this case, since this patch will be backported to stable and distro kernels, we really don't want the patch to touch any code it doesn't have to. A bug fix patch should just address the bug, and all cosmetic changes should be in a separate patch. Tony, if you still want to change the lines in xhci_stop and xhci_suspend to remove the extra parens, please add that to the cleanup patch you submitted and re-send the patch. Sarah Sharp > >@@ -732,7 +732,7 @@ 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); > > > > if (xhci->quirks & XHCI_AMD_PLL_FIX) > >@@ -927,7 +927,7 @@ int xhci_suspend(struct xhci_hcd *xhci) > > * is about to be suspended. > > */ > > 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, "Compliance Mode Recovery Timer Deleted!\n"); > > } > >@@ -988,6 +988,13 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) > > > > /* If restore operation fails, re-initialize the HC during resume */ > > if ((temp & STS_SRE) || hibernated) { > >+ > >+ 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"); > >+ } > >+ > > /* Let the USB core know _both_ roothubs lost power. */ > > usb_root_hub_lost_power(xhci->main_hcd->self.root_hub); > > usb_root_hub_lost_power(xhci->shared_hcd->self.root_hub); > >@@ -1071,7 +1078,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) > > * to suffer the Compliance Mode issue again. It doesn't matter if > > * ports have entered previously to U0 before system's suspension. > > */ > >- if (xhci->quirks & XHCI_COMP_MODE_QUIRK) > >+ if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) && !hibernated) > > compliance_mode_recovery_timer_init(xhci); > > > > /* Re-enable port polling. */ > > > -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html