[SCSI] convert to the new PM framework

This patch (as1397b) converts the SCSI midlayer to use the new PM
callbacks (struct dev_pm_ops).  A new source file, scsi_pm.c, is
created to hold the new callback routines, and the existing
suspend/resume code is moved there.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 1 insertions, 47 deletions

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index c23ab978c3ba..5f85f8e831f3 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -376,57 +376,11 @@ static int scsi_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
         return 0;
 }
 
-static int scsi_bus_suspend(struct device * dev, pm_message_t state)
-{
-        struct device_driver *drv;
-        struct scsi_device *sdev;
-        int err;
-
-        if (dev->type != &scsi_dev_type)
-                return 0;
-
-        drv = dev->driver;
-        sdev = to_scsi_device(dev);
-
-        err = scsi_device_quiesce(sdev);
-        if (err)
-                return err;
-
-        if (drv && drv->suspend) {
-                err = drv->suspend(dev, state);
-                if (err)
-                        return err;
-        }
-
-        return 0;
-}
-
-static int scsi_bus_resume(struct device * dev)
-{
-        struct device_driver *drv;
-        struct scsi_device *sdev;
-        int err = 0;
-
-        if (dev->type != &scsi_dev_type)
-                return 0;
-
-        drv = dev->driver;
-        sdev = to_scsi_device(dev);
-
-        if (drv && drv->resume)
-                err = drv->resume(dev);
-
-        scsi_device_resume(sdev);
-
-        return err;
-}
-
 struct bus_type scsi_bus_type = {
         .name           = "scsi",
         .match          = scsi_bus_match,
         .uevent         = scsi_bus_uevent,
-        .suspend        = scsi_bus_suspend,
-        .resume         = scsi_bus_resume,
+        .pm             = &scsi_bus_pm_ops,
 };
 EXPORT_SYMBOL_GPL(scsi_bus_type);