aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/char/sclp_cpi_sys.c
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2008-07-14 09:59:28 +0200
committerHeiko Carstens <heiko.carstens@de.ibm.com>2008-07-14 10:02:19 +0200
commita12c53f4fa759b59654b6d5f21eb4070cd45cd54 (patch)
treeca2c7ff8ecde4cc57518403fbd5ceb48fbe9f9cd /drivers/s390/char/sclp_cpi_sys.c
parent[S390] Cleanup zcrypt printk messages. (diff)
downloadlinux-dev-a12c53f4fa759b59654b6d5f21eb4070cd45cd54.tar.xz
linux-dev-a12c53f4fa759b59654b6d5f21eb4070cd45cd54.zip
[S390] Cleanup sclp printk messages.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'drivers/s390/char/sclp_cpi_sys.c')
-rw-r--r--drivers/s390/char/sclp_cpi_sys.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/s390/char/sclp_cpi_sys.c b/drivers/s390/char/sclp_cpi_sys.c
index 005f330ed926..d887bd261d28 100644
--- 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);