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>

1 files changed, 4 insertions, 4 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index 1a3686d15f98..4a520051c315 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -65,7 +65,7 @@ struct bus_type {
         int (*resume_early)(struct device *dev);
         int (*resume)(struct device *dev);
 
-        struct pm_ext_ops *pm;
+        struct dev_pm_ops *pm;
 
         struct bus_type_private *p;
 };
@@ -133,7 +133,7 @@ struct device_driver {
         int (*resume) (struct device *dev);
         struct attribute_group **groups;
 
-        struct pm_ops *pm;
+        struct dev_pm_ops *pm;
 
         struct driver_private *p;
 };
@@ -198,7 +198,7 @@ struct class {
         int (*suspend)(struct device *dev, pm_message_t state);
         int (*resume)(struct device *dev);
 
-        struct pm_ops *pm;
+        struct dev_pm_ops *pm;
         struct class_private *p;
 };
 
@@ -291,7 +291,7 @@ struct device_type {
         int (*suspend)(struct device *dev, pm_message_t state);
         int (*resume)(struct device *dev);
 
-        struct pm_ops *pm;
+        struct dev_pm_ops *pm;
 };
 
 /* interface for exporting device attributes */