[S390] Cleanup zfcp dumper printk messages.

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

1 files changed, 12 insertions, 19 deletions

diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index bbbd14e9d48f..047dd92ae804 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -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 */
 
         sa = kmalloc(sizeof(*sa), GFP_KERNEL);
-        if (!sa) {
-                ERROR_MSG("kmalloc failed: %s: %i\n",__func__, __LINE__);
+        if (!sa)
                 return -ENOMEM;
-        }
         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);
                 return -EIO;
         }
@@ -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)
 {
+        int rc;
+
         switch (arch) {
         case ARCH_S390X:
                 MSG("DETECTED 'S390X (64 bit) OS'\n");
@@ -529,10 +529,9 @@ static int __init sys_info_init(enum arch_id arch)
                 return -EINVAL;
         }
         sys_info.arch = arch;
-        if (init_cpu_info(arch)) {
-                ERROR_MSG("get cpu info failed\n");
-                return -ENOMEM;
-        }
+        rc = init_cpu_info(arch);
+        if (rc)
+                return rc;
         sys_info.mem_size = real_memory_size;
 
         return 0;
@@ -544,12 +543,12 @@ static int __init check_sdias(void)
 
         rc = sclp_sdias_blk_count();
         if (rc < 0) {
-                ERROR_MSG("Could not determine HSA size\n");
+                TRACE("Could not determine HSA size\n");
                 return rc;
         }
         act_hsa_size = (rc - 1) * PAGE_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 0;
@@ -590,16 +589,12 @@ static int __init zcore_init(void)
                 goto fail;
 
         rc = check_sdias();
-        if (rc) {
-                ERROR_MSG("Dump initialization failed\n");
+        if (rc)
                 goto fail;
-        }
 
         rc = memcpy_hsa_kernel(&arch, __LC_AR_MODE_ID, 1);
-        if (rc) {
-                ERROR_MSG("sdial memcpy for arch id failed\n");
+        if (rc)
                 goto fail;
-        }
 
 #ifndef __s390x__
         if (arch == ARCH_S390X) {
@@ -610,10 +605,8 @@ static int __init zcore_init(void)
 #endif
 
         rc = sys_info_init(arch);
-        if (rc) {
-                ERROR_MSG("arch init failed\n");
+        if (rc)
                 goto fail;
-        }
 
         zcore_header_init(arch, &zcore_header);