usb: convert r8a66597-hcd to dev_pm_ops
PATCH 1/1 usb: convert r8a66597-hcd to dev_pm_ops
From: Magnus Damm <[email protected]>
Convert the r8a66597-hcd driver to dev_pm_ops. This makes the driver a good PM citizen and removes a warning printout.
---
Tested on a ap325 board with sh7723 cpu using on-chip r8a66597.
drivers/usb/host/r8a66597-hcd.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/usb/host/r8a66597-hcd.c +13 -8
@@ -2306,9 +2306,9 @@ static struct hc_driver r8a66597_hc_driv };#if defined(CONFIG_PM ) -static int r8a66597_suspend (struct platform_device *pdev,pm_message_t state) +static int r8a66597_suspend (struct device *dev) { -struct r8a66597 *r8a66597 =dev_get_drvdata (&pdev->dev); +struct r8a66597 *r8a66597 =dev_get_drvdata (dev);int port;dbg ("%s" , __func__);
@@ -2324,9 +2324,9 @@ static int r8a66597_suspend(struct platfreturn 0 ; } -static int r8a66597_resume (struct platform_device *pdev) +static int r8a66597_resume (struct device *dev) { -struct r8a66597 *r8a66597 =dev_get_drvdata (&pdev->dev); +struct r8a66597 *r8a66597 =dev_get_drvdata (dev);struct usb_hcd *hcd =r8a66597_to_hcd (r8a66597);dbg ("%s" , __func__);
@@ -2336,9 +2336,15 @@ static int r8a66597_resume(struct platforeturn 0 ; } + +static struct dev_pm_ops r8a66597_dev_pm_ops = { + .suspend = r8a66597_suspend, + .resume = r8a66597_resume, +}; + +#define R8A66597_DEV_PM_OPS (&r8a66597_dev_pm_ops)#else /* if defined(CONFIG_PM) */ -#define r8a66597_suspend NULL -#define r8a66597_resume NULL +#define R8A66597_DEV_PM_OPS NULL#endif static int __init_or_module r8a66597_remove(struct platform_device *pdev)
@@ -2474,11 +2480,10 @@ clean_up:static struct platform_driver r8a66597_driver = { .probe = r8a66597_probe, .remove = r8a66597_remove, - .suspend = r8a66597_suspend, - .resume = r8a66597_resume, .driver = { .name = (char *) hcd_name, .owner =THIS_MODULE , + .pm =R8A66597_DEV_PM_OPS , }, };
Quoted 9 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Convert the r8a66597-hcd driver to
dev_pm_ops. This makes the driver a good PM citizen and removes a warning printout.Signed-off-by Magnus Damm <[email protected]>---
Tested on a ap325 board with sh7723 cpu using on-chip r8a66597.
When I checked this patch on sh7785lcr board, I looked a little problem. The problem is that usb device cannot re-enumerate when resume from hibernation. I made the new patch.
Thanks,
Yoshihiro Shimoda
---
Convert the r8a66597-hcd driver to dev_pm_ops. This makes the driver a good PM citizen and removes warning printout.
--- drivers/usb/host/r8a66597-hcd.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-)
drivers/usb/host/r8a66597-hcd.c +15 -8
@@ -2305,9 +2305,9 @@ static struct hc_driver r8a66597_hc_driver = { };#if defined(CONFIG_PM ) -static int r8a66597_suspend (struct platform_device *pdev,pm_message_t state) +static int r8a66597_suspend (struct device *dev) { -struct r8a66597 *r8a66597 =dev_get_drvdata (&pdev->dev); +struct r8a66597 *r8a66597 =dev_get_drvdata (dev);int port;dbg ("%s" , __func__);
@@ -2323,9 +2323,9 @@ static int r8a66597_suspend(struct platform_device *pdev, pm_message_t state)return 0 ; } -static int r8a66597_resume (struct platform_device *pdev) +static int r8a66597_resume (struct device *dev) { -struct r8a66597 *r8a66597 =dev_get_drvdata (&pdev->dev); +struct r8a66597 *r8a66597 =dev_get_drvdata (dev);struct usb_hcd *hcd =r8a66597_to_hcd (r8a66597);dbg ("%s" , __func__);
@@ -2335,9 +2335,17 @@ static int r8a66597_resume(struct platform_device *pdev)return 0 ; } + +static struct dev_pm_ops r8a66597_dev_pm_ops = { + .suspend = r8a66597_suspend, + .resume = r8a66597_resume, + .poweroff = r8a66597_suspend, + .restore = r8a66597_resume, +}; + +#define R8A66597_DEV_PM_OPS (&r8a66597_dev_pm_ops)#else /* if defined(CONFIG_PM) */ -#define r8a66597_suspend NULL -#define r8a66597_resume NULL +#define R8A66597_DEV_PM_OPS NULL#endif static int __init_or_module r8a66597_remove(struct platform_device *pdev)
@@ -2473,11 +2481,10 @@ clean_up:static struct platform_driver r8a66597_driver = { .probe = r8a66597_probe, .remove = r8a66597_remove, - .suspend = r8a66597_suspend, - .resume = r8a66597_resume, .driver = { .name = (char *) hcd_name, .owner =THIS_MODULE , + .pm =R8A66597_DEV_PM_OPS , }, };
--
1.5.5