Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (33 commits)
  [S390] s390: hibernation support for s390
  [S390] pm: dcssblk power management callbacks.
  [S390] pm: monreader power management callbacks.
  [S390] pm: monwriter power management callbacks.
  [S390] pm: memory hotplug power management callbacks
  [S390] pm: con3270 power management callbacks.
  [S390] pm: smsgiucv power management callbacks.
  [S390] pm: hvc_iucv power management callbacks
  [S390] PM: af_iucv power management callbacks.
  [S390] pm: netiucv power management callbacks.
  [S390] pm: iucv power management callbacks.
  [S390] iucv: establish reboot notifier
  [S390] pm: power management support for SCLP drivers.
  [S390] pm: tape power management callbacks
  [S390] pm: vmlogrdr power management callbacks
  [S390] pm: vmur driver power management callbacks
  [S390] pm: appldata power management callbacks
  [S390] pm: vmwatchdog power management callbacks.
  [S390] pm: zfcp driver power management callbacks
  [S390] pm: claw driver power management callbacks
  ...

1 files changed, 73 insertions, 5 deletions

diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 22ce765d537e..a5a62f1f7747 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -1,11 +1,10 @@
 /*
- *  drivers/s390/cio/ccwgroup.c
  *  bus driver for ccwgroup
  *
- *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
- *                       IBM Corporation
- *    Author(s): Arnd Bergmann (arndb@de.ibm.com)
- *               Cornelia Huck (cornelia.huck@de.ibm.com)
+ *  Copyright IBM Corp. 2002, 2009
+ *
+ *  Author(s): Arnd Bergmann (arndb@de.ibm.com)
+ *             Cornelia Huck (cornelia.huck@de.ibm.com)
  */
 #include <linux/module.h>
 #include <linux/errno.h>
@@ -501,6 +500,74 @@ static void ccwgroup_shutdown(struct device *dev)
                 gdrv->shutdown(gdev);
 }
 
+static int ccwgroup_pm_prepare(struct device *dev)
+{
+        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
+        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(gdev->dev.driver);
+
+        /* Fail while device is being set online/offline. */
+        if (atomic_read(&gdev->onoff))
+                return -EAGAIN;
+
+        if (!gdev->dev.driver || gdev->state != CCWGROUP_ONLINE)
+                return 0;
+
+        return gdrv->prepare ? gdrv->prepare(gdev) : 0;
+}
+
+static void ccwgroup_pm_complete(struct device *dev)
+{
+        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
+        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(dev->driver);
+
+        if (!gdev->dev.driver || gdev->state != CCWGROUP_ONLINE)
+                return;
+
+        if (gdrv->complete)
+                gdrv->complete(gdev);
+}
+
+static int ccwgroup_pm_freeze(struct device *dev)
+{
+        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
+        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(gdev->dev.driver);
+
+        if (!gdev->dev.driver || gdev->state != CCWGROUP_ONLINE)
+                return 0;
+
+        return gdrv->freeze ? gdrv->freeze(gdev) : 0;
+}
+
+static int ccwgroup_pm_thaw(struct device *dev)
+{
+        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
+        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(gdev->dev.driver);
+
+        if (!gdev->dev.driver || gdev->state != CCWGROUP_ONLINE)
+                return 0;
+
+        return gdrv->thaw ? gdrv->thaw(gdev) : 0;
+}
+
+static int ccwgroup_pm_restore(struct device *dev)
+{
+        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
+        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(gdev->dev.driver);
+
+        if (!gdev->dev.driver || gdev->state != CCWGROUP_ONLINE)
+                return 0;
+
+        return gdrv->restore ? gdrv->restore(gdev) : 0;
+}
+
+static struct dev_pm_ops ccwgroup_pm_ops = {
+        .prepare = ccwgroup_pm_prepare,
+        .complete = ccwgroup_pm_complete,
+        .freeze = ccwgroup_pm_freeze,
+        .thaw = ccwgroup_pm_thaw,
+        .restore = ccwgroup_pm_restore,
+};
+
 static struct bus_type ccwgroup_bus_type = {
         .name   = "ccwgroup",
         .match  = ccwgroup_bus_match,
@@ -508,6 +575,7 @@ static struct bus_type ccwgroup_bus_type = {
         .probe  = ccwgroup_probe,
         .remove = ccwgroup_remove,
         .shutdown = ccwgroup_shutdown,
+        .pm = &ccwgroup_pm_ops,
 };