projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[S390] Cleanup sclp printk messages.
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
s390
/
char
/
sclp_cpi_sys.c
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);
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;
goto out;
- }
if (!(sclp_cpi_event.sclp_receive_mask & EVTYP_CTLPROGIDENT_MASK)) {
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)) {
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;
}
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);
/* 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;
goto out_free_req;
- }
wait_for_completion(&completion);
wait_for_completion(&completion);