]> err.no Git - linux-2.6/commitdiff
USB: usb-ohci-sm501-driver: use the conventional convention for suspend and resume
authorAndrew Morton <akpm@linux-foundation.org>
Tue, 5 Feb 2008 07:57:48 +0000 (23:57 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 25 Apr 2008 04:16:34 +0000 (21:16 -0700)
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>
drivers/usb/host/ohci-sm501.c

index 4ea92762fb289521431431c8af5ae8b3475b5261..8ffcd3e5f56bb0efaf7bc67026bff491c4807bb0 100644 (file)
@@ -242,6 +242,9 @@ static int ohci_sm501_resume(struct platform_device *pdev)
        usb_hcd_resume_root_hub(platform_get_drvdata(pdev));
        return 0;
 }
+#else
+#define ohci_sm501_suspend NULL
+#define ohci_sm501_resume NULL
 #endif
 
 /*-------------------------------------------------------------------------*/
@@ -253,10 +256,8 @@ static struct platform_driver ohci_hcd_sm501_driver = {
        .probe          = ohci_hcd_sm501_drv_probe,
        .remove         = ohci_hcd_sm501_drv_remove,
        .shutdown       = usb_hcd_platform_shutdown,
-#ifdef CONFIG_PM
        .suspend        = ohci_sm501_suspend,
        .resume         = ohci_sm501_resume,
-#endif
        .driver         = {
                .owner  = THIS_MODULE,
                .name   = "sm501-usb",