| Message ID | 1374485566-3997-5-git-send-email-manjunath.goudar@linaro.org |
|---|---|
| State | Accepted |
| Commit | 86a63f10211ba7d249763bbe10b52073273affa8 |
| Headers | show |
Hello. On 22-07-2013 13:32, 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> > Acked-by: Alan Stern <stern@rowland.harvard.edu> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Greg KH <greg@kroah.com> > Cc: linux-usb@vger.kernel.org > V2: > -Incase ohci_suspend() fails, return right away without > executing further. > V3: > -Aligned variable "do_wakeup" and "ret". > -pdev->dev.power.power_state stuff has been removed. > V4: > -Properly aligned "do_wakeup" and "ret" variable. > --- > drivers/usb/host/ohci-da8xx.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c > index 6aaa9c9..c649a35 100644 > --- a/drivers/usb/host/ohci-da8xx.c > +++ b/drivers/usb/host/ohci-da8xx.c > @@ -406,19 +406,26 @@ 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) Please start this line under *struct* above. Don't break the coding style we used in this file. WBR, Sergei
On 22 July 2013 17:48, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>wrote: > Hello. > > > On 22-07-2013 13:32, 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> >> Acked-by: Alan Stern <stern@rowland.harvard.edu> >> Cc: Arnd Bergmann <arnd@arndb.de> >> Cc: Greg KH <greg@kroah.com> >> Cc: linux-usb@vger.kernel.org >> > > V2: >> -Incase ohci_suspend() fails, return right away without >> executing further. >> > > V3: >> -Aligned variable "do_wakeup" and "ret". >> -pdev->dev.power.power_state stuff has been removed. >> > > V4: >> -Properly aligned "do_wakeup" and "ret" variable. >> --- >> drivers/usb/host/ohci-da8xx.c | 15 +++++++++++---- >> 1 file changed, 11 insertions(+), 4 deletions(-) >> > > diff --git a/drivers/usb/host/ohci-da8xx.**c >> b/drivers/usb/host/ohci-da8xx.**c >> index 6aaa9c9..c649a35 100644 >> --- a/drivers/usb/host/ohci-da8xx.**c >> +++ b/drivers/usb/host/ohci-da8xx.**c >> @@ -406,19 +406,26 @@ 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) >> > > Please start this line under *struct* above. Don't break the coding > style we used in this file. > > WBR, Sergei > > OK sure thank for comment. Thanks Manjunath Goudar
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c index 6aaa9c9..c649a35 100644 --- a/drivers/usb/host/ohci-da8xx.c +++ b/drivers/usb/host/ohci-da8xx.c @@ -406,19 +406,26 @@ 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); + if (ret) + return ret; + ohci_da8xx_clock(0); hcd->state = HC_STATE_SUSPENDED; - dev->dev.power.power_state = PMSG_SUSPEND; - return 0; + + return ret; } static int ohci_da8xx_resume(struct platform_device *dev)