[S390] proper use of device register

[safe/jmp/linux-2.6] / drivers / s390 / net / smsgiucv.c

diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 3ccca58..102000d 100644 (file)
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -1,7 +1,8 @@
 /*
  * IUCV special message driver
  *
- * Copyright 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ * Copyright IBM Corp. 2003, 2009
+ *
  * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,9 +41,11 @@ MODULE_AUTHOR
 MODULE_DESCRIPTION ("Linux for S/390 IUCV special message driver");
 
 static struct iucv_path *smsg_path;
+/* dummy device used as trigger for PM functions */
+static struct device *smsg_dev;
 
 static DEFINE_SPINLOCK(smsg_list_lock);
-static struct list_head smsg_list = LIST_HEAD_INIT(smsg_list);
+static LIST_HEAD(smsg_list);
 
 static int smsg_path_pending(struct iucv_path *, u8 ipvmid[8], u8 ipuser[16]);
 static void smsg_message_pending(struct iucv_path *, struct iucv_message *);
@@ -132,14 +135,51 @@ void smsg_unregister_callback(char *prefix,
        kfree(cb);
 }
 
+static int smsg_pm_freeze(struct device *dev)
+{
+#ifdef CONFIG_PM_DEBUG
+       printk(KERN_WARNING "smsg_pm_freeze\n");
+#endif
+       if (smsg_path)
+               iucv_path_sever(smsg_path, NULL);
+       return 0;
+}
+
+static int smsg_pm_restore_thaw(struct device *dev)
+{
+       int rc;
+
+#ifdef CONFIG_PM_DEBUG
+       printk(KERN_WARNING "smsg_pm_restore_thaw\n");
+#endif
+       if (smsg_path) {
+               memset(smsg_path, 0, sizeof(*smsg_path));
+               smsg_path->msglim = 255;
+               smsg_path->flags = 0;
+               rc = iucv_path_connect(smsg_path, &smsg_handler, "*MSG    ",
+                                      NULL, NULL, NULL);
+               printk(KERN_ERR "iucv_path_connect returned with rc %i\n", rc);
+       }
+       return 0;
+}
+
+static struct dev_pm_ops smsg_pm_ops = {
+       .freeze = smsg_pm_freeze,
+       .thaw = smsg_pm_restore_thaw,
+       .restore = smsg_pm_restore_thaw,
+};
+
 static struct device_driver smsg_driver = {
+       .owner = THIS_MODULE,
        .name = "SMSGIUCV",
        .bus  = &iucv_bus,
+       .pm = &smsg_pm_ops,
 };
 
 static void __exit smsg_exit(void)
 {
        cpcmd("SET SMSG IUCV", NULL, 0, NULL);
+       device_unregister(smsg_dev);
        iucv_unregister(&smsg_handler, 1);
        driver_unregister(&smsg_driver);
 }
@@ -148,15 +188,16 @@ static int __init smsg_init(void)
 {
        int rc;
 
+       if (!MACHINE_IS_VM) {
+               rc = -EPROTONOSUPPORT;
+               goto out;
+       }
        rc = driver_register(&smsg_driver);
        if (rc != 0)
                goto out;
        rc = iucv_register(&smsg_handler, 1);
-       if (rc) {
-               printk(KERN_ERR "SMSGIUCV: failed to register to iucv");
-               rc = -EIO;      /* better errno ? */
+       if (rc)
                goto out_driver;
-       }
        smsg_path = iucv_path_alloc(255, 0, GFP_KERNEL);
        if (!smsg_path) {
                rc = -ENOMEM;
@@ -164,16 +205,30 @@ static int __init smsg_init(void)
        }
        rc = iucv_path_connect(smsg_path, &smsg_handler, "*MSG    ",
                               NULL, NULL, NULL);
-       if (rc) {
-               printk(KERN_ERR "SMSGIUCV: failed to connect to *MSG");
-               rc = -EIO;      /* better errno ? */
-               goto out_free;
+       if (rc)
+               goto out_free_path;
+       smsg_dev = kzalloc(sizeof(struct device), GFP_KERNEL);
+       if (!smsg_dev) {
+               rc = -ENOMEM;
+               goto out_free_path;
        }
+       dev_set_name(smsg_dev, "smsg_iucv");
+       smsg_dev->bus = &iucv_bus;
+       smsg_dev->parent = iucv_root;
+       smsg_dev->release = (void (*)(struct device *))kfree;
+       smsg_dev->driver = &smsg_driver;
+       rc = device_register(smsg_dev);
+       if (rc)
+               goto out_put;
+
        cpcmd("SET SMSG IUCV", NULL, 0, NULL);
        return 0;
 
-out_free:
+out_put:
+       put_device(smsg_dev);
+out_free_path:
        iucv_path_free(smsg_path);
+       smsg_path = NULL;
 out_register:
        iucv_unregister(&smsg_handler, 1);
 out_driver: