Hi, On Mon, Feb 11, 2013 at 04:08:31PM +0530, kishon wrote: > Hi, > > On Monday 11 February 2013 03:27 PM, Felipe Balbi wrote: > >From: Vikas Sajjan <vikas.sajjan@xxxxxxxxxx> > > > >Adds power management support to xHCI platform driver. > > > >This patch facilitates the transition of xHCI host controller > >between S0 and S3/S4 power states, during suspend/resume cycles. > > > >Signed-off-by: Abhilash Kesavan <a.kesavan@xxxxxxxxxxx> > >Signed-off-by: Vikas C Sajjan <vikas.sajjan@xxxxxxxxxx> > >CC: Doug Anderson <dianders@xxxxxxxxxxxx> > >Signed-off-by: Felipe Balbi <balbi@xxxxxx> > >--- > > > >Hi Sarah, > > > >can you carry this patch for v3.10 merge window ? I have > >refreshed it against v3.8-rc7 and dropped the check > >for HC_STATE_SUSPENDED which we have moved to xhci_suspend() > >itself. > > > >cheers > > > > drivers/usb/host/xhci-plat.c | 23 +++++++++++++++++++++++ > > 1 file changed, 23 insertions(+) > > > >diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > >index df90fe5..45913d1 100644 > >--- a/drivers/usb/host/xhci-plat.c > >+++ b/drivers/usb/host/xhci-plat.c > >@@ -185,11 +185,34 @@ static int xhci_plat_remove(struct platform_device *dev) > > return 0; > > } > > > >+#ifdef CONFIG_PM_SLEEP > >+static int xhci_plat_suspend(struct device *dev) > >+{ > >+ struct usb_hcd *hcd = dev_get_drvdata(dev); > >+ struct xhci_hcd *xhci = hcd_to_xhci(hcd); > >+ > >+ return xhci_suspend(xhci); > >+} > >+ > >+static int xhci_plat_resume(struct device *dev) > >+{ > >+ struct usb_hcd *hcd = dev_get_drvdata(dev); > >+ struct xhci_hcd *xhci = hcd_to_xhci(hcd); > >+ > >+ return xhci_resume(xhci, 0); > >+} > >+#endif /* CONFIG_PM_SLEEP */ > > > >+ > >+static const struct dev_pm_ops xhci_plat_pm_ops = { > >+ SET_SYSTEM_SLEEP_PM_OPS(xhci_plat_suspend, xhci_plat_resume) > >+}; > > "#endif" should be here. > > Also a macro should be added and set to NULL if CONFIG_PM_SLEEP is > not defined. Just like how .pm in many other drivers is done. nice catch, will fix it ;-) -- balbi
Attachment:
signature.asc
Description: Digital signature