[S390] Remove code duplication from monreader / dcssblk.

Move the function that prints the segment warning messages found in the
monreader driver and the dcssblk driver to the extmem base code.

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

1 files changed, 1 insertions, 52 deletions

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index e6c94dbfdeaa..04787eab1016 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -142,57 +142,6 @@ dcssblk_get_device_by_name(char *name)
         return NULL;
 }
 
-/*
- * print appropriate error message for segment_load()/segment_type()
- * return code
- */
-static void
-dcssblk_segment_warn(int rc, char* seg_name)
-{
-        switch (rc) {
-        case -ENOENT:
-                PRINT_WARN("cannot load/query segment %s, does not exist\n",
-                           seg_name);
-                break;
-        case -ENOSYS:
-                PRINT_WARN("cannot load/query segment %s, not running on VM\n",
-                           seg_name);
-                break;
-        case -EIO:
-                PRINT_WARN("cannot load/query segment %s, hardware error\n",
-                           seg_name);
-                break;
-        case -ENOTSUPP:
-                PRINT_WARN("cannot load/query segment %s, is a multi-part "
-                           "segment\n", seg_name);
-                break;
-        case -ENOSPC:
-                PRINT_WARN("cannot load/query segment %s, overlaps with "
-                           "storage\n", seg_name);
-                break;
-        case -EBUSY:
-                PRINT_WARN("cannot load/query segment %s, overlaps with "
-                           "already loaded dcss\n", seg_name);
-                break;
-        case -EPERM:
-                PRINT_WARN("cannot load/query segment %s, already loaded in "
-                           "incompatible mode\n", seg_name);
-                break;
-        case -ENOMEM:
-                PRINT_WARN("cannot load/query segment %s, out of memory\n",
-                           seg_name);
-                break;
-        case -ERANGE:
-                PRINT_WARN("cannot load/query segment %s, exceeds kernel "
-                           "mapping range\n", seg_name);
-                break;
-        default:
-                PRINT_WARN("cannot load/query segment %s, return value %i\n",
-                           seg_name, rc);
-                break;
-        }
-}
-
 static void dcssblk_unregister_callback(struct device *dev)
 {
         device_unregister(dev);
@@ -423,7 +372,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
         rc = segment_load(local_buf, SEGMENT_SHARED,
                                 &dev_info->start, &dev_info->end);
         if (rc < 0) {
-                dcssblk_segment_warn(rc, dev_info->segment_name);
+                segment_warning(rc, dev_info->segment_name);
                 goto dealloc_gendisk;
         }
         seg_byte_size = (dev_info->end - dev_info->start + 1);