[S390] Cleanup sclp printk messages.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 277f9ccfbb7c2e94867f29018ed6a13e0634a7cb..fb97cf5ee6742b8a8c0c286b91e5f991dbc52632 100644 (file)
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -784,11 +784,9 @@ sclp_check_handler(__u16 code)
        /* Is this the interrupt we are waiting for? */
        if (finished_sccb == 0)
                return;
-       if (finished_sccb != (u32) (addr_t) sclp_init_sccb) {
-               printk(KERN_WARNING SCLP_HEADER "unsolicited interrupt "
-                      "for buffer at 0x%x\n", finished_sccb);
-               return;
-       }
+       if (finished_sccb != (u32) (addr_t) sclp_init_sccb)
+               panic("sclp: unsolicited interrupt for buffer at 0x%x\n",
+                     finished_sccb);
        spin_lock(&sclp_lock);
        if (sclp_running_state == sclp_running_state_running) {
                sclp_init_req.status = SCLP_REQ_DONE;

diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c
index 23bb90a5ed29c0be3d58e101179aea6c7934062a..0ddf1b7c00daf414c8dae6cea09e4ed48e868b5b 100644 (file)
--- a/drivers/s390/char/sclp_con.c
+++ b/drivers/s390/char/sclp_con.c
@@ -20,8 +20,6 @@
 #include "sclp_rw.h"
 #include "sclp_tty.h"
 
-#define SCLP_CON_PRINT_HEADER "sclp console driver: "
-
 #define sclp_console_major 4           /* TTYAUX_MAJOR */
 #define sclp_console_minor 64
 #define sclp_console_name  "ttyS"

diff --git a/drivers/s390/char/sclp_config.c b/drivers/s390/char/sclp_config.c
index 7c9b39cee595e41ed5a4959d6a998213aed129b2..fff4ff485d9bcbb8e3bc25c05d465b8214f8774b 100644 (file)
--- a/drivers/s390/char/sclp_config.c
+++ b/drivers/s390/char/sclp_config.c
@@ -85,10 +85,8 @@ static int __init sclp_conf_init(void)
        INIT_WORK(&sclp_cpu_change_work, sclp_cpu_change_notify);
 
        rc = sclp_register(&sclp_conf_register);
-       if (rc) {
-               printk(KERN_ERR TAG "failed to register (%d).\n", rc);
+       if (rc)
                return rc;
-       }
 
        if (!(sclp_conf_register.sclp_send_mask & EVTYP_CONFMGMDATA_MASK)) {
                printk(KERN_WARNING TAG "no configuration management.\n");

diff --git a/drivers/s390/char/sclp_cpi_sys.c b/drivers/s390/char/sclp_cpi_sys.c
index 005f330ed92689a0de2faaf7e3108879e4a213a9..d887bd261d28e2029847213d1f6e017ed41dd06f 100644 (file)
--- a/drivers/s390/char/sclp_cpi_sys.c
+++ b/drivers/s390/char/sclp_cpi_sys.c
@@ -126,21 +126,15 @@ static int cpi_req(void)
        int response;
 
        rc = sclp_register(&sclp_cpi_event);
-       if (rc) {
-               printk(KERN_WARNING "cpi: could not register "
-                       "to hardware console.\n");
+       if (rc)
                goto out;
-       }
        if (!(sclp_cpi_event.sclp_receive_mask & EVTYP_CTLPROGIDENT_MASK)) {
-               printk(KERN_WARNING "cpi: no control program "
-                       "identification support\n");
                rc = -EOPNOTSUPP;
                goto out_unregister;
        }
 
        req = cpi_prepare_req();
        if (IS_ERR(req)) {
-               printk(KERN_WARNING "cpi: could not allocate request\n");
                rc = PTR_ERR(req);
                goto out_unregister;
        }
@@ -150,10 +144,8 @@ static int cpi_req(void)
 
        /* Add request to sclp queue */
        rc = sclp_add_request(req);
-       if (rc) {
-               printk(KERN_WARNING "cpi: could not start request\n");
+       if (rc)
                goto out_free_req;
-       }
 
        wait_for_completion(&completion);
 

diff --git a/drivers/s390/char/sclp_quiesce.c b/drivers/s390/char/sclp_quiesce.c
index 45ff25e787cbdad96659617eee981d6854e02700..84c191c1cd620fa1e5a723dcb060f9a8d4ae9175 100644 (file)
--- a/drivers/s390/char/sclp_quiesce.c
+++ b/drivers/s390/char/sclp_quiesce.c
@@ -51,13 +51,7 @@ static struct sclp_register sclp_quiesce_event = {
 static int __init
 sclp_quiesce_init(void)
 {
-       int rc;
-
-       rc = sclp_register(&sclp_quiesce_event);
-       if (rc)
-               printk(KERN_WARNING "sclp: could not register quiesce handler "
-                      "(rc=%d)\n", rc);
-       return rc;
+       return sclp_register(&sclp_quiesce_event);
 }
 
 module_init(sclp_quiesce_init);

diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c
index da09781b32f7b0959441c2d6a4a544319d284edf..710af42603f80f7866b2d3be13e7ebaff14ce166 100644 (file)
--- a/drivers/s390/char/sclp_rw.c
+++ b/drivers/s390/char/sclp_rw.c
@@ -19,8 +19,6 @@
 #include "sclp.h"
 #include "sclp_rw.h"
 
-#define SCLP_RW_PRINT_HEADER "sclp low level driver: "
-
 /*
  * The room for the SCCB (only for writing) is not equal to a pages size
  * (as it is specified as the maximum size in the SCLP documentation)

diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c
index 1c064976b32bd322a4e4554e9d335bf1cef71328..8b854857ba0733eb5a8a56a9451318a8d383603c 100644 (file)
--- a/drivers/s390/char/sclp_sdias.c
+++ b/drivers/s390/char/sclp_sdias.c
@@ -239,10 +239,8 @@ int __init sclp_sdias_init(void)
        debug_register_view(sdias_dbf, &debug_sprintf_view);
        debug_set_level(sdias_dbf, 6);
        rc = sclp_register(&sclp_sdias_register);
-       if (rc) {
-               ERROR_MSG("sclp register failed\n");
+       if (rc)
                return rc;
-       }
        init_waitqueue_head(&sdias_wq);
        TRACE("init done\n");
        return 0;

diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index 40b11521cd20246ee308a34c92909f7c849058e9..d3b1957cd2f3d30b1ab02dcc62ab242603c7b9df 100644 (file)
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -25,8 +25,6 @@
 #include "sclp_rw.h"
 #include "sclp_tty.h"
 
-#define SCLP_TTY_PRINT_HEADER "sclp tty driver: "
-
 /*
  * size of a buffer that collects single characters coming in
  * via sclp_tty_put_char()
@@ -736,9 +734,6 @@ sclp_tty_init(void)
 
        rc = sclp_rw_init();
        if (rc) {
-               printk(KERN_ERR SCLP_TTY_PRINT_HEADER
-                      "could not register tty - "
-                      "sclp_rw_init returned %d\n", rc);
                put_tty_driver(driver);
                return rc;
        }
@@ -792,9 +787,6 @@ sclp_tty_init(void)
        tty_set_operations(driver, &sclp_ops);
        rc = tty_register_driver(driver);
        if (rc) {
-               printk(KERN_ERR SCLP_TTY_PRINT_HEADER
-                      "could not register tty - "
-                      "tty_register_driver returned %d\n", rc);
                put_tty_driver(driver);
                return rc;
        }

diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index baea4d5485231d94471179c563f21c75b54b43c0..ad51738c4261973a7f4fb8b74296dc5dcc17bb85 100644 (file)
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -27,7 +27,6 @@
 #include <asm/uaccess.h>
 #include "sclp.h"
 
-#define SCLP_VT220_PRINT_HEADER        "sclp vt220 tty driver: "
 #define SCLP_VT220_MAJOR               TTY_MAJOR
 #define SCLP_VT220_MINOR               65
 #define SCLP_VT220_DRIVER_NAME         "sclp_vt220"
@@ -716,12 +715,8 @@ static int __init sclp_vt220_tty_init(void)
        tty_set_operations(driver, &sclp_vt220_ops);
 
        rc = tty_register_driver(driver);
-       if (rc) {
-               printk(KERN_ERR SCLP_VT220_PRINT_HEADER
-                      "could not register tty - "
-                      "tty_register_driver returned %d\n", rc);
+       if (rc)
                goto out_init;
-       }
        sclp_vt220_driver = driver;
        return 0;