Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1409e8e0 authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman
Browse files

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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5ddeac11

drivers/usb/host/ohci-sm501.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -242,6 +242,9 @@ static int ohci_sm501_resume(struct platform_device *pdev) 
	usb_hcd_resume_root_hub(platform_get_drvdata(pdev));

	usb_hcd_resume_root_hub(platform_get_drvdata(pdev));

	return 0;

	return 0;

}

}

#else

#define ohci_sm501_suspend NULL

#define ohci_sm501_resume NULL

#endif

#endif





/*-------------------------------------------------------------------------*/

/*-------------------------------------------------------------------------*/
@@ -253,10 +256,8 @@ static struct platform_driver ohci_hcd_sm501_driver = { 
	.probe		= ohci_hcd_sm501_drv_probe,

	.probe		= ohci_hcd_sm501_drv_probe,

	.remove		= ohci_hcd_sm501_drv_remove,

	.remove		= ohci_hcd_sm501_drv_remove,

	.shutdown	= usb_hcd_platform_shutdown,

	.shutdown	= usb_hcd_platform_shutdown,

#ifdef	CONFIG_PM

	.suspend	= ohci_sm501_suspend,

	.suspend	= ohci_sm501_suspend,

	.resume		= ohci_sm501_resume,

	.resume		= ohci_sm501_resume,

#endif

	.driver		= {

	.driver		= {

		.owner	= THIS_MODULE,

		.owner	= THIS_MODULE,

		.name	= "sm501-usb",

		.name	= "sm501-usb",