Commit 2a062ab4 authored by Michael Holzheu's avatar Michael Holzheu Committed by Heiko Carstens

[S390] Cleanup zfcp dumper printk messages.

Signed-off-by: default avatarMichael Holzheu <holzheu@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 2f6f2521
...@@ -223,12 +223,10 @@ static int __init init_cpu_info(enum arch_id arch) ...@@ -223,12 +223,10 @@ static int __init init_cpu_info(enum arch_id arch)
/* get info for boot cpu from lowcore, stored in the HSA */ /* get info for boot cpu from lowcore, stored in the HSA */
sa = kmalloc(sizeof(*sa), GFP_KERNEL); sa = kmalloc(sizeof(*sa), GFP_KERNEL);
if (!sa) { if (!sa)
ERROR_MSG("kmalloc failed: %s: %i\n",__func__, __LINE__);
return -ENOMEM; return -ENOMEM;
}
if (memcpy_hsa_kernel(sa, sys_info.sa_base, sys_info.sa_size) < 0) { if (memcpy_hsa_kernel(sa, sys_info.sa_base, sys_info.sa_size) < 0) {
ERROR_MSG("could not copy from HSA\n"); TRACE("could not copy from HSA\n");
kfree(sa); kfree(sa);
return -EIO; return -EIO;
} }
...@@ -511,6 +509,8 @@ static void __init set_s390x_lc_mask(union save_area *map) ...@@ -511,6 +509,8 @@ static void __init set_s390x_lc_mask(union save_area *map)
*/ */
static int __init sys_info_init(enum arch_id arch) static int __init sys_info_init(enum arch_id arch)
{ {
int rc;
switch (arch) { switch (arch) {
case ARCH_S390X: case ARCH_S390X:
MSG("DETECTED 'S390X (64 bit) OS'\n"); MSG("DETECTED 'S390X (64 bit) OS'\n");
...@@ -529,10 +529,9 @@ static int __init sys_info_init(enum arch_id arch) ...@@ -529,10 +529,9 @@ static int __init sys_info_init(enum arch_id arch)
return -EINVAL; return -EINVAL;
} }
sys_info.arch = arch; sys_info.arch = arch;
if (init_cpu_info(arch)) { rc = init_cpu_info(arch);
ERROR_MSG("get cpu info failed\n"); if (rc)
return -ENOMEM; return rc;
}
sys_info.mem_size = real_memory_size; sys_info.mem_size = real_memory_size;
return 0; return 0;
...@@ -544,12 +543,12 @@ static int __init check_sdias(void) ...@@ -544,12 +543,12 @@ static int __init check_sdias(void)
rc = sclp_sdias_blk_count(); rc = sclp_sdias_blk_count();
if (rc < 0) { if (rc < 0) {
ERROR_MSG("Could not determine HSA size\n"); TRACE("Could not determine HSA size\n");
return rc; return rc;
} }
act_hsa_size = (rc - 1) * PAGE_SIZE; act_hsa_size = (rc - 1) * PAGE_SIZE;
if (act_hsa_size < ZFCPDUMP_HSA_SIZE) { if (act_hsa_size < ZFCPDUMP_HSA_SIZE) {
ERROR_MSG("HSA size too small: %i\n", act_hsa_size); TRACE("HSA size too small: %i\n", act_hsa_size);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
...@@ -590,16 +589,12 @@ static int __init zcore_init(void) ...@@ -590,16 +589,12 @@ static int __init zcore_init(void)
goto fail; goto fail;
rc = check_sdias(); rc = check_sdias();
if (rc) { if (rc)
ERROR_MSG("Dump initialization failed\n");
goto fail; goto fail;
}
rc = memcpy_hsa_kernel(&arch, __LC_AR_MODE_ID, 1); rc = memcpy_hsa_kernel(&arch, __LC_AR_MODE_ID, 1);
if (rc) { if (rc)
ERROR_MSG("sdial memcpy for arch id failed\n");
goto fail; goto fail;
}
#ifndef __s390x__ #ifndef __s390x__
if (arch == ARCH_S390X) { if (arch == ARCH_S390X) {
...@@ -610,10 +605,8 @@ static int __init zcore_init(void) ...@@ -610,10 +605,8 @@ static int __init zcore_init(void)
#endif #endif
rc = sys_info_init(arch); rc = sys_info_init(arch);
if (rc) { if (rc)
ERROR_MSG("arch init failed\n");
goto fail; goto fail;
}
zcore_header_init(arch, &zcore_header); zcore_header_init(arch, &zcore_header);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment