s390/sclp: Remove console power management support

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

Remove leftover sclp console-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/sclp_con.c b/drivers/s390/char/sclp_con.c
index 9b852a47ccc1b1257107f625404b4c092e82ef2c..67860769036c7fb20035893d2c1fe4d604533120 100644 (file)
--- a/drivers/s390/char/sclp_con.c
+++ b/drivers/s390/char/sclp_con.c
@@ -35,8 +35,6 @@ static LIST_HEAD(sclp_con_outqueue);
 static struct sclp_buffer *sclp_conbuf;
 /* Timer for delayed output of console messages */
 static struct timer_list sclp_con_timer;
-/* Suspend mode flag */
-static int sclp_con_suspended;
 /* Flag that output queue is currently running */
 static int sclp_con_queue_running;
 
@@ -63,7 +61,7 @@ sclp_conbuf_callback(struct sclp_buffer *buffer, int rc)
                if (!list_empty(&sclp_con_outqueue))
                        buffer = list_first_entry(&sclp_con_outqueue,
                                                  struct sclp_buffer, list);
-               if (!buffer || sclp_con_suspended) {
+               if (!buffer) {
                        sclp_con_queue_running = 0;
                        spin_unlock_irqrestore(&sclp_con_lock, flags);
                        break;
@@ -85,7 +83,7 @@ static void sclp_conbuf_emit(void)
        if (sclp_conbuf)
                list_add_tail(&sclp_conbuf->list, &sclp_con_outqueue);
        sclp_conbuf = NULL;
-       if (sclp_con_queue_running || sclp_con_suspended)
+       if (sclp_con_queue_running)
                goto out_unlock;
        if (list_empty(&sclp_con_outqueue))
                goto out_unlock;
@@ -179,8 +177,6 @@ sclp_console_write(struct console *console, const char *message,
                        if (list_empty(&sclp_con_pages))
                                sclp_console_full++;
                        while (list_empty(&sclp_con_pages)) {
-                               if (sclp_con_suspended)
-                                       goto out;
                                if (sclp_console_drop_buffer())
                                        break;
                                spin_unlock_irqrestore(&sclp_con_lock, flags);
@@ -213,7 +209,6 @@ sclp_console_write(struct console *console, const char *message,
            !timer_pending(&sclp_con_timer)) {
                mod_timer(&sclp_con_timer, jiffies + HZ / 10);
        }
-out:
        spin_unlock_irqrestore(&sclp_con_lock, flags);
 }
 
@@ -234,32 +229,6 @@ sclp_console_flush(void)
        sclp_console_sync_queue();
 }
 
-/*
- * Resume console: If there are cached messages, emit them.
- */
-static void sclp_console_resume(void)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&sclp_con_lock, flags);
-       sclp_con_suspended = 0;
-       spin_unlock_irqrestore(&sclp_con_lock, flags);
-       sclp_conbuf_emit();
-}
-
-/*
- * Suspend console: Set suspend flag and flush console
- */
-static void sclp_console_suspend(void)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&sclp_con_lock, flags);
-       sclp_con_suspended = 1;
-       spin_unlock_irqrestore(&sclp_con_lock, flags);
-       sclp_console_flush();
-}
-
 static int sclp_console_notify(struct notifier_block *self,
                               unsigned long event, void *data)
 {
@@ -269,7 +238,7 @@ static int sclp_console_notify(struct notifier_block *self,
 
 static struct notifier_block on_panic_nb = {
        .notifier_call = sclp_console_notify,
-       .priority = SCLP_PANIC_PRIO_CLIENT,
+       .priority = 1,
 };
 
 static struct notifier_block on_reboot_nb = {
@@ -290,22 +259,6 @@ static struct console sclp_console =
        .index = 0 /* ttyS0 */
 };
 
-/*
- * This function is called for SCLP suspend and resume events.
- */
-void sclp_console_pm_event(enum sclp_pm_event sclp_pm_event)
-{
-       switch (sclp_pm_event) {
-       case SCLP_PM_EVENT_FREEZE:
-               sclp_console_suspend();
-               break;
-       case SCLP_PM_EVENT_RESTORE:
-       case SCLP_PM_EVENT_THAW:
-               sclp_console_resume();
-               break;
-       }
-}
-
 /*
  * called by console_init() in drivers/char/tty_io.c at boot-time.
  */

diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c
index d6c84e354df5b88f083a6c7f3f1773fc2b51f32e..de44c15fe03a754a3bb2e10546e3728efd43d4fc 100644 (file)
--- a/drivers/s390/char/sclp_rw.c
+++ b/drivers/s390/char/sclp_rw.c
@@ -26,16 +26,9 @@
  */
 #define MAX_SCCB_ROOM (PAGE_SIZE - sizeof(struct sclp_buffer))
 
-static void sclp_rw_pm_event(struct sclp_register *reg,
-                            enum sclp_pm_event sclp_pm_event)
-{
-       sclp_console_pm_event(sclp_pm_event);
-}
-
 /* Event type structure for write message and write priority message */
 static struct sclp_register sclp_rw_event = {
        .send_mask = EVTYP_MSG_MASK,
-       .pm_event_fn = sclp_rw_pm_event,
 };
 
 /*

diff --git a/drivers/s390/char/sclp_rw.h b/drivers/s390/char/sclp_rw.h
index 93d706e4935ce4e316119ee60e9324687467cae4..a9127489f224039d653d728c31e87f5696146e1c 100644 (file)
--- a/drivers/s390/char/sclp_rw.h
+++ b/drivers/s390/char/sclp_rw.h
@@ -88,10 +88,4 @@ int sclp_write(struct sclp_buffer *buffer, const unsigned char *, int);
 int sclp_emit_buffer(struct sclp_buffer *,void (*)(struct sclp_buffer *,int));
 int sclp_chars_in_buffer(struct sclp_buffer *);
 
-#ifdef CONFIG_SCLP_CONSOLE
-void sclp_console_pm_event(enum sclp_pm_event sclp_pm_event);
-#else
-static inline void sclp_console_pm_event(enum sclp_pm_event sclp_pm_event) { }
-#endif
-
 #endif /* __SCLP_RW_H__ */