s390/monwriter: Remove power management support

Power management support was removed for s390 with
commit f5b114f6d22e ("s390: remove broken hibernate / power management
support").

Remove leftover monwriter-related power management code.

Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index fdc0c0b7a6f58ec8b62ef131b2530aac162f1fbe..9cd1ea92d619b3bfbb2f1971361447272f354f9e 100644 (file)
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -20,7 +20,6 @@
 #include <linux/ctype.h>
 #include <linux/poll.h>
 #include <linux/mutex.h>
-#include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
 #include <asm/ebcdic.h>
@@ -40,10 +39,7 @@ struct mon_buf {
        char *data;
 };
 
-static LIST_HEAD(mon_priv_list);
-
 struct mon_private {
-       struct list_head priv_list;
        struct list_head list;
        struct monwrite_hdr hdr;
        size_t hdr_to_read;
@@ -199,7 +195,6 @@ static int monwrite_open(struct inode *inode, struct file *filp)
        monpriv->hdr_to_read = sizeof(monpriv->hdr);
        mutex_init(&monpriv->thread_mutex);
        filp->private_data = monpriv;
-       list_add_tail(&monpriv->priv_list, &mon_priv_list);
        return nonseekable_open(inode, filp);
 }
 
@@ -217,7 +212,6 @@ static int monwrite_close(struct inode *inode, struct file *filp)
                kfree(entry->data);
                kfree(entry);
        }
-       list_del(&monpriv->priv_list);
        kfree(monpriv);
        return 0;
 }
@@ -293,106 +287,24 @@ static struct miscdevice mon_dev = {
        .minor  = MISC_DYNAMIC_MINOR,
 };
 
-/*
- * suspend/resume
- */
-
-static int monwriter_freeze(struct device *dev)
-{
-       struct mon_private *monpriv;
-       struct mon_buf *monbuf;
-
-       list_for_each_entry(monpriv, &mon_priv_list, priv_list) {
-               list_for_each_entry(monbuf, &monpriv->list, list) {
-                       if (monbuf->hdr.mon_function != MONWRITE_GEN_EVENT)
-                               monwrite_diag(&monbuf->hdr, monbuf->data,
-                                             APPLDATA_STOP_REC);
-               }
-       }
-       return 0;
-}
-
-static int monwriter_restore(struct device *dev)
-{
-       struct mon_private *monpriv;
-       struct mon_buf *monbuf;
-
-       list_for_each_entry(monpriv, &mon_priv_list, priv_list) {
-               list_for_each_entry(monbuf, &monpriv->list, list) {
-                       if (monbuf->hdr.mon_function == MONWRITE_START_INTERVAL)
-                               monwrite_diag(&monbuf->hdr, monbuf->data,
-                                             APPLDATA_START_INTERVAL_REC);
-                       if (monbuf->hdr.mon_function == MONWRITE_START_CONFIG)
-                               monwrite_diag(&monbuf->hdr, monbuf->data,
-                                             APPLDATA_START_CONFIG_REC);
-               }
-       }
-       return 0;
-}
-
-static int monwriter_thaw(struct device *dev)
-{
-       return monwriter_restore(dev);
-}
-
-static const struct dev_pm_ops monwriter_pm_ops = {
-       .freeze         = monwriter_freeze,
-       .thaw           = monwriter_thaw,
-       .restore        = monwriter_restore,
-};
-
-static struct platform_driver monwriter_pdrv = {
-       .driver = {
-               .name   = "monwriter",
-               .pm     = &monwriter_pm_ops,
-       },
-};
-
-static struct platform_device *monwriter_pdev;
-
 /*
  * module init/exit
  */
 
 static int __init mon_init(void)
 {
-       int rc;
-
        if (!MACHINE_IS_VM)
                return -ENODEV;
-
-       rc = platform_driver_register(&monwriter_pdrv);
-       if (rc)
-               return rc;
-
-       monwriter_pdev = platform_device_register_simple("monwriter", -1, NULL,
-                                                       0);
-       if (IS_ERR(monwriter_pdev)) {
-               rc = PTR_ERR(monwriter_pdev);
-               goto out_driver;
-       }
-
        /*
         * misc_register() has to be the last action in module_init(), because
         * file operations will be available right after this.
         */
-       rc = misc_register(&mon_dev);
-       if (rc)
-               goto out_device;
-       return 0;
-
-out_device:
-       platform_device_unregister(monwriter_pdev);
-out_driver:
-       platform_driver_unregister(&monwriter_pdrv);
-       return rc;
+       return misc_register(&mon_dev);
 }
 
 static void __exit mon_exit(void)
 {
        misc_deregister(&mon_dev);
-       platform_device_unregister(monwriter_pdev);
-       platform_driver_unregister(&monwriter_pdrv);
 }
 
 module_init(mon_init);