PM: Simplify the new suspend/hibernation framework for devices
PM: Simplify the new suspend/hibernation framework for devices Following the discussion at the Kernel Summit, simplify the new device PM framework by merging 'struct pm_ops' and 'struct pm_ext_ops' and removing pointers to 'struct pm_ext_ops' from 'struct platform_driver' and 'struct pci_driver'. After this change, the suspend/hibernation callbacks will only reside in 'struct device_driver' as well as at the bus type/ device class/device type level. Accordingly, PCI and platform device drivers are now expected to put their suspend/hibernation callbacks into the 'struct device_driver' embedded in 'struct pci_driver' or 'struct platform_driver', respectively. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Pavel Machek <pavel@suse.cz> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
238c6d5483
commit
adf094931f
@@ -286,7 +286,7 @@ static int usb_dev_restore(struct device *dev)
|
||||
return usb_resume(dev);
|
||||
}
|
||||
|
||||
static struct pm_ops usb_device_pm_ops = {
|
||||
static struct dev_pm_ops usb_device_pm_ops = {
|
||||
.prepare = usb_dev_prepare,
|
||||
.complete = usb_dev_complete,
|
||||
.suspend = usb_dev_suspend,
|
||||
@@ -301,7 +301,7 @@ static struct pm_ops usb_device_pm_ops = {
|
||||
|
||||
#define ksuspend_usb_init() 0
|
||||
#define ksuspend_usb_cleanup() do {} while (0)
|
||||
#define usb_device_pm_ops (*(struct pm_ops *)0)
|
||||
#define usb_device_pm_ops (*(struct dev_pm_ops *)0)
|
||||
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user