diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-05 02:57:48 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-25 00:16:34 -0400 |
commit | 1409e8e0e4dae15735727d7e2814b62aff609d31 (patch) | |
tree | 270133e6ac36d8c8bde069f6e7819998ce357145 /drivers/usb/host/ohci-sm501.c | |
parent | 5ddeac117f869c0da85e41e89dd5ed1199dab7dd (diff) |
USB: usb-ohci-sm501-driver: use the conventional convention for suspend and resume
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/ohci-sm501.c')
-rw-r--r-- | drivers/usb/host/ohci-sm501.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c index 4ea92762fb28..8ffcd3e5f56b 100644 --- a/drivers/usb/host/ohci-sm501.c +++ b/drivers/usb/host/ohci-sm501.c | |||
@@ -242,6 +242,9 @@ static int ohci_sm501_resume(struct platform_device *pdev) | |||
242 | usb_hcd_resume_root_hub(platform_get_drvdata(pdev)); | 242 | usb_hcd_resume_root_hub(platform_get_drvdata(pdev)); |
243 | return 0; | 243 | return 0; |
244 | } | 244 | } |
245 | #else | ||
246 | #define ohci_sm501_suspend NULL | ||
247 | #define ohci_sm501_resume NULL | ||
245 | #endif | 248 | #endif |
246 | 249 | ||
247 | /*-------------------------------------------------------------------------*/ | 250 | /*-------------------------------------------------------------------------*/ |
@@ -253,10 +256,8 @@ static struct platform_driver ohci_hcd_sm501_driver = { | |||
253 | .probe = ohci_hcd_sm501_drv_probe, | 256 | .probe = ohci_hcd_sm501_drv_probe, |
254 | .remove = ohci_hcd_sm501_drv_remove, | 257 | .remove = ohci_hcd_sm501_drv_remove, |
255 | .shutdown = usb_hcd_platform_shutdown, | 258 | .shutdown = usb_hcd_platform_shutdown, |
256 | #ifdef CONFIG_PM | ||
257 | .suspend = ohci_sm501_suspend, | 259 | .suspend = ohci_sm501_suspend, |
258 | .resume = ohci_sm501_resume, | 260 | .resume = ohci_sm501_resume, |
259 | #endif | ||
260 | .driver = { | 261 | .driver = { |
261 | .owner = THIS_MODULE, | 262 | .owner = THIS_MODULE, |
262 | .name = "sm501-usb", | 263 | .name = "sm501-usb", |