| Message ID | 1371050918-29472-4-git-send-email-manjunath.goudar@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
Hello. On 12-06-2013 19:28, Manjunath Goudar wrote: > Suspend scenario in case of ohci-da8xx glue was not > properly handled as it was not suspending generic part > of ohci controller.Calling explicitly the ohci_suspend() > routine in ohci_da8xx_suspend() will ensure proper > handling of suspend scenario. > Signed-off-by: Manjunath Goudar <manjunath.goudar@linaro.org> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Alan Stern <stern@rowland.harvard.edu> > Cc: Greg KH <greg@kroah.com> > Cc: linux-usb@vger.kernel.org > --- > drivers/usb/host/ohci-da8xx.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c > index 6aaa9c9..3b1d9bd 100644 > --- a/drivers/usb/host/ohci-da8xx.c > +++ b/drivers/usb/host/ohci-da8xx.c > @@ -406,19 +406,24 @@ static int ohci_hcd_da8xx_drv_remove(struct platform_device *dev) > } > > #ifdef CONFIG_PM > -static int ohci_da8xx_suspend(struct platform_device *dev, pm_message_t message) > +static int ohci_da8xx_suspend(struct platform_device *pdev, > + pm_message_t message) > { > - struct usb_hcd *hcd = platform_get_drvdata(dev); > + struct usb_hcd *hcd = platform_get_drvdata(pdev); > struct ohci_hcd *ohci = hcd_to_ohci(hcd); > + bool do_wakeup = device_may_wakeup(&pdev->dev); Could you align = with other intializers above? > + int ret; > WBR, Sergei
On 12 June 2013 21:24, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>wrote: > Hello. > > > On 12-06-2013 19:28, Manjunath Goudar wrote: > > Suspend scenario in case of ohci-da8xx glue was not >> properly handled as it was not suspending generic part >> of ohci controller.Calling explicitly the ohci_suspend() >> routine in ohci_da8xx_suspend() will ensure proper >> handling of suspend scenario. >> > > Signed-off-by: Manjunath Goudar <manjunath.goudar@linaro.org> >> Cc: Arnd Bergmann <arnd@arndb.de> >> Cc: Alan Stern <stern@rowland.harvard.edu> >> Cc: Greg KH <greg@kroah.com> >> Cc: linux-usb@vger.kernel.org >> --- >> drivers/usb/host/ohci-da8xx.c | 13 +++++++++---- >> 1 file changed, 9 insertions(+), 4 deletions(-) >> > > diff --git a/drivers/usb/host/ohci-da8xx.**c >> b/drivers/usb/host/ohci-da8xx.**c >> index 6aaa9c9..3b1d9bd 100644 >> --- a/drivers/usb/host/ohci-da8xx.**c >> +++ b/drivers/usb/host/ohci-da8xx.**c >> @@ -406,19 +406,24 @@ static int ohci_hcd_da8xx_drv_remove(**struct >> platform_device *dev) >> } >> >> #ifdef CONFIG_PM >> -static int ohci_da8xx_suspend(struct platform_device *dev, pm_message_t >> message) >> +static int ohci_da8xx_suspend(struct platform_device *pdev, >> + pm_message_t message) >> { >> - struct usb_hcd *hcd = platform_get_drvdata(dev); >> + struct usb_hcd *hcd = platform_get_drvdata(pdev); >> struct ohci_hcd *ohci = hcd_to_ohci(hcd); >> + bool do_wakeup = device_may_wakeup(&pdev->dev); >> > > Could you align = with other intializers above? > > + int ret; >> >> I cross checked your comments in my series,it is not having any alignment problem,I dont know how it is showing align problem here. > > WBR, Sergei > >
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c index 6aaa9c9..3b1d9bd 100644 --- a/drivers/usb/host/ohci-da8xx.c +++ b/drivers/usb/host/ohci-da8xx.c @@ -406,19 +406,24 @@ static int ohci_hcd_da8xx_drv_remove(struct platform_device *dev) } #ifdef CONFIG_PM -static int ohci_da8xx_suspend(struct platform_device *dev, pm_message_t message) +static int ohci_da8xx_suspend(struct platform_device *pdev, + pm_message_t message) { - struct usb_hcd *hcd = platform_get_drvdata(dev); + struct usb_hcd *hcd = platform_get_drvdata(pdev); struct ohci_hcd *ohci = hcd_to_ohci(hcd); + bool do_wakeup = device_may_wakeup(&pdev->dev); + int ret; if (time_before(jiffies, ohci->next_statechange)) msleep(5); ohci->next_statechange = jiffies; + ret = ohci_suspend(hcd, do_wakeup); + ohci_da8xx_clock(0); hcd->state = HC_STATE_SUSPENDED; - dev->dev.power.power_state = PMSG_SUSPEND; - return 0; + pdev->dev.power.power_state = PMSG_SUSPEND; + return ret; } static int ohci_da8xx_resume(struct platform_device *dev)
Suspend scenario in case of ohci-da8xx glue was not properly handled as it was not suspending generic part of ohci controller.Calling explicitly the ohci_suspend() routine in ohci_da8xx_suspend() will ensure proper handling of suspend scenario. Signed-off-by: Manjunath Goudar <manjunath.goudar@linaro.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Greg KH <greg@kroah.com> Cc: linux-usb@vger.kernel.org --- drivers/usb/host/ohci-da8xx.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)