s390/ipl: rename diagnose enums

Rename DIAG308_IPL and DIAG308_DUMP to DIAG308_LOAD_CLEAR and
DIAG308_LOAD_NORMAL_DUMP to better reflect the associated IPL
functions.

Suggested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Suggested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
index 6fc44dca193ef8d90646fb0f67e1b128a3dc8a2a..4da22b2f0521a6822aa61f92e09f9544489304b9 100644 (file)
--- a/arch/s390/include/asm/ipl.h
+++ b/arch/s390/include/asm/ipl.h
@@ -141,11 +141,11 @@ extern void setup_ipl(void);
  * DIAG 308 support
  */
 enum diag308_subcode  {
-       DIAG308_REL_HSA = 2,
-       DIAG308_IPL     = 3,
-       DIAG308_DUMP    = 4,
-       DIAG308_SET     = 5,
-       DIAG308_STORE   = 6,
+       DIAG308_REL_HSA = 2,
+       DIAG308_LOAD_CLEAR = 3,
+       DIAG308_LOAD_NORMAL_DUMP = 4,
+       DIAG308_SET = 5,
+       DIAG308_STORE = 6,
 };
 
 enum diag308_ipl_type {

diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index b0dbf9a265f50ca3a03195d035391b744595f3fe..b892480cd4d8fef0b5f3b731064cd3c6dd7ec2be 100644 (file)
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -563,7 +563,7 @@ static struct kset *ipl_kset;
 
 static void __ipl_run(void *unused)
 {
-       diag308(DIAG308_IPL, NULL);
+       diag308(DIAG308_LOAD_CLEAR, NULL);
        if (MACHINE_IS_VM)
                __cpcmd("IPL", NULL, 0, NULL);
        else if (ipl_info.type == IPL_TYPE_CCW)
@@ -1086,23 +1086,23 @@ static void __reipl_run(void *unused)
        case REIPL_METHOD_CCW_DIAG:
                diag308(DIAG308_SET, reipl_block_ccw);
                if (MACHINE_IS_LPAR)
-                       diag308(DIAG308_DUMP, NULL);
+                       diag308(DIAG308_LOAD_NORMAL_DUMP, NULL);
                else
-                       diag308(DIAG308_IPL, NULL);
+                       diag308(DIAG308_LOAD_CLEAR, NULL);
                break;
        case REIPL_METHOD_FCP_RW_DIAG:
                diag308(DIAG308_SET, reipl_block_fcp);
-               diag308(DIAG308_IPL, NULL);
+               diag308(DIAG308_LOAD_CLEAR, NULL);
                break;
        case REIPL_METHOD_FCP_RO_DIAG:
-               diag308(DIAG308_IPL, NULL);
+               diag308(DIAG308_LOAD_CLEAR, NULL);
                break;
        case REIPL_METHOD_FCP_RO_VM:
                __cpcmd("IPL", NULL, 0, NULL);
                break;
        case REIPL_METHOD_NSS_DIAG:
                diag308(DIAG308_SET, reipl_block_nss);
-               diag308(DIAG308_IPL, NULL);
+               diag308(DIAG308_LOAD_CLEAR, NULL);
                break;
        case REIPL_METHOD_NSS:
                get_ipl_string(buf, reipl_block_nss, REIPL_METHOD_NSS);
@@ -1111,7 +1111,7 @@ static void __reipl_run(void *unused)
        case REIPL_METHOD_DEFAULT:
                if (MACHINE_IS_VM)
                        __cpcmd("IPL", NULL, 0, NULL);
-               diag308(DIAG308_IPL, NULL);
+               diag308(DIAG308_LOAD_CLEAR, NULL);
                break;
        case REIPL_METHOD_FCP_DUMP:
                break;
@@ -1426,7 +1426,7 @@ static void diag308_dump(void *dump_block)
 {
        diag308(DIAG308_SET, dump_block);
        while (1) {
-               if (diag308(DIAG308_DUMP, NULL) != 0x302)
+               if (diag308(DIAG308_LOAD_NORMAL_DUMP, NULL) != 0x302)
                        break;
                udelay_simple(USEC_PER_SEC);
        }

diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index 5043ecfa1fbcfecf10cc8c2ae34dd1b0e591d6c1..16992e2a40ad551a64c4e8eee57df9ca3ccca80b 100644 (file)
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -185,7 +185,7 @@ static ssize_t zcore_reipl_write(struct file *filp, const char __user *buf,
 {
        if (ipl_block) {
                diag308(DIAG308_SET, ipl_block);
-               diag308(DIAG308_IPL, NULL);
+               diag308(DIAG308_LOAD_CLEAR, NULL);
        }
        return count;
 }