diff options
Diffstat (limited to 'drivers/s390/char/sclp_cpi_sys.c')
-rw-r--r-- | drivers/s390/char/sclp_cpi_sys.c | 12 |
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) | |||
126 | int response; | 126 | int response; |
127 | 127 | ||
128 | rc = sclp_register(&sclp_cpi_event); | 128 | rc = sclp_register(&sclp_cpi_event); |
129 | if (rc) { | 129 | if (rc) |
130 | printk(KERN_WARNING "cpi: could not register " | ||
131 | "to hardware console.\n"); | ||
132 | goto out; | 130 | goto out; |
133 | } | ||
134 | if (!(sclp_cpi_event.sclp_receive_mask & EVTYP_CTLPROGIDENT_MASK)) { | 131 | if (!(sclp_cpi_event.sclp_receive_mask & EVTYP_CTLPROGIDENT_MASK)) { |
135 | printk(KERN_WARNING "cpi: no control program " | ||
136 | "identification support\n"); | ||
137 | rc = -EOPNOTSUPP; | 132 | rc = -EOPNOTSUPP; |
138 | goto out_unregister; | 133 | goto out_unregister; |
139 | } | 134 | } |
140 | 135 | ||
141 | req = cpi_prepare_req(); | 136 | req = cpi_prepare_req(); |
142 | if (IS_ERR(req)) { | 137 | if (IS_ERR(req)) { |
143 | printk(KERN_WARNING "cpi: could not allocate request\n"); | ||
144 | rc = PTR_ERR(req); | 138 | rc = PTR_ERR(req); |
145 | goto out_unregister; | 139 | goto out_unregister; |
146 | } | 140 | } |
@@ -150,10 +144,8 @@ static int cpi_req(void) | |||
150 | 144 | ||
151 | /* Add request to sclp queue */ | 145 | /* Add request to sclp queue */ |
152 | rc = sclp_add_request(req); | 146 | rc = sclp_add_request(req); |
153 | if (rc) { | 147 | if (rc) |
154 | printk(KERN_WARNING "cpi: could not start request\n"); | ||
155 | goto out_free_req; | 148 | goto out_free_req; |
156 | } | ||
157 | 149 | ||
158 | wait_for_completion(&completion); | 150 | wait_for_completion(&completion); |
159 | 151 | ||