[S390] irq: external interrupt code passing

The external interrupt handlers have a parameter called ext_int_code.
Besides the name this paramter does not only contain the ext_int_code
but in addition also the "cpu address" (POP) which caused the external
interrupt.
To make the code a bit more obvious pass a struct instead so the called
function can easily distinguish between external interrupt code and
cpu address. The cpu address field however is named "subcode" since
some external interrupt sources do not pass a cpu address but a
different parameter (or none at all).

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

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)
 }
 
 /* Handle external interruption. */
-static void dasd_ext_handler(unsigned int ext_int_code,
+static void dasd_ext_handler(struct ext_code ext_code,
                              unsigned int param32, unsigned long param64)
 {
         struct dasd_ccw_req *cqr, *next;
@@ -239,7 +239,7 @@ static void dasd_ext_handler(unsigned int ext_int_code,
         addr_t ip;
         int rc;
 
-        switch (ext_int_code >> 24) {
+        switch (ext_code.subcode >> 8) {
         case DASD_DIAG_CODE_31BIT:
                 ip = (addr_t) param32;
                 break;
@@ -280,7 +280,7 @@ static void dasd_ext_handler(unsigned int ext_int_code,
         cqr->stopclk = get_clock();
 
         expires = 0;
-        if ((ext_int_code & 0xff0000) == 0) {
+        if ((ext_code.subcode & 0xff) == 0) {
                 cqr->status = DASD_CQR_SUCCESS;
                 /* Start first request on queue if possible -> fast_io. */
                 if (!list_empty(&device->ccw_queue)) {
@@ -296,7 +296,7 @@ static void dasd_ext_handler(unsigned int ext_int_code,
                 cqr->status = DASD_CQR_QUEUED;
                 DBF_DEV_EVENT(DBF_DEBUG, device, "interrupt status for "
                               "request %p was %d (%d retries left)", cqr,
-                              (ext_int_code >> 16) & 0xff, cqr->retries);
+                              ext_code.subcode & 0xff, cqr->retries);
                 dasd_diag_erp(device);
         }