diff options
Diffstat (limited to 'drivers/s390/block/dasd_diag.c')
-rw-r--r-- | drivers/s390/block/dasd_diag.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c index 46784b83c5c4..0cea7e98f464 100644 --- a/drivers/s390/block/dasd_diag.c +++ b/drivers/s390/block/dasd_diag.c | |||
@@ -229,7 +229,7 @@ dasd_diag_term_IO(struct dasd_ccw_req * cqr) | |||
229 | } | 229 | } |
230 | 230 | ||
231 | /* Handle external interruption. */ | 231 | /* Handle external interruption. */ |
232 | static void dasd_ext_handler(unsigned int ext_int_code, | 232 | static void dasd_ext_handler(struct ext_code ext_code, |
233 | unsigned int param32, unsigned long param64) | 233 | unsigned int param32, unsigned long param64) |
234 | { | 234 | { |
235 | struct dasd_ccw_req *cqr, *next; | 235 | struct dasd_ccw_req *cqr, *next; |
@@ -239,7 +239,7 @@ static void dasd_ext_handler(unsigned int ext_int_code, | |||
239 | addr_t ip; | 239 | addr_t ip; |
240 | int rc; | 240 | int rc; |
241 | 241 | ||
242 | switch (ext_int_code >> 24) { | 242 | switch (ext_code.subcode >> 8) { |
243 | case DASD_DIAG_CODE_31BIT: | 243 | case DASD_DIAG_CODE_31BIT: |
244 | ip = (addr_t) param32; | 244 | ip = (addr_t) param32; |
245 | break; | 245 | break; |
@@ -280,7 +280,7 @@ static void dasd_ext_handler(unsigned int ext_int_code, | |||
280 | cqr->stopclk = get_clock(); | 280 | cqr->stopclk = get_clock(); |
281 | 281 | ||
282 | expires = 0; | 282 | expires = 0; |
283 | if ((ext_int_code & 0xff0000) == 0) { | 283 | if ((ext_code.subcode & 0xff) == 0) { |
284 | cqr->status = DASD_CQR_SUCCESS; | 284 | cqr->status = DASD_CQR_SUCCESS; |
285 | /* Start first request on queue if possible -> fast_io. */ | 285 | /* Start first request on queue if possible -> fast_io. */ |
286 | if (!list_empty(&device->ccw_queue)) { | 286 | if (!list_empty(&device->ccw_queue)) { |
@@ -296,7 +296,7 @@ static void dasd_ext_handler(unsigned int ext_int_code, | |||
296 | cqr->status = DASD_CQR_QUEUED; | 296 | cqr->status = DASD_CQR_QUEUED; |
297 | DBF_DEV_EVENT(DBF_DEBUG, device, "interrupt status for " | 297 | DBF_DEV_EVENT(DBF_DEBUG, device, "interrupt status for " |
298 | "request %p was %d (%d retries left)", cqr, | 298 | "request %p was %d (%d retries left)", cqr, |
299 | (ext_int_code >> 16) & 0xff, cqr->retries); | 299 | ext_code.subcode & 0xff, cqr->retries); |
300 | dasd_diag_erp(device); | 300 | dasd_diag_erp(device); |
301 | } | 301 | } |
302 | 302 | ||