Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a12c53f4 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Heiko Carstens
Browse files

[S390] Cleanup sclp printk messages. 



Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 1a89dd8f

drivers/s390/char/sclp.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

drivers/s390/char/sclp_con.c

+0 −2
Original line number Diff line number Diff line
@@ -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"

drivers/s390/char/sclp_config.c

+1 −3
Original line number Diff line number Diff line
@@ -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");

drivers/s390/char/sclp_cpi_sys.c

+2 −10
Original line number Diff line number Diff line
@@ -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);

drivers/s390/char/sclp_quiesce.c

+1 −7
Original line number Diff line number Diff line
@@ -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);