[S390] cio: Clean up messages.

- Remove unneeded messages.
- Move some messages into the debug feature.
- Use dev_* where appropriate.
- Use "cio: " prefix consistently.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index ec0404874fad..bd5f16f80bf8 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -51,7 +51,7 @@ blacklist_range (range_action action, unsigned int from, unsigned int to,
                 to = from;
 
         if (from > to || to > __MAX_SUBCHANNEL || ssid > __MAX_SSID) {
-                printk (KERN_WARNING "Invalid blacklist range "
+                printk (KERN_WARNING "cio: Invalid blacklist range "
                         "0.%x.%04x to 0.%x.%04x, skipping\n",
                         ssid, from, ssid, to);
                 return;
@@ -119,7 +119,7 @@ blacklist_busid(char **str, int *id0, int *ssid, int *devno)
         return 0;
 confused:
         strsep(str, ",\n");
-        printk(KERN_WARNING "Invalid cio_ignore parameter '%s'\n", sav);
+        printk(KERN_WARNING "cio: Invalid cio_ignore parameter '%s'\n", sav);
         return 1;
 }
 
@@ -166,22 +166,19 @@ blacklist_parse_parameters (char *str, range_action action)
                                         continue;
                         }
                         if (*str == '-') {
-                                printk(KERN_WARNING "invalid cio_ignore "
+                                printk(KERN_WARNING "cio: invalid cio_ignore "
                                         "parameter '%s'\n",
                                         strsep(&str, ",\n"));
                                 continue;
                         }
                         if ((from_id0 != to_id0) ||
                             (from_ssid != to_ssid)) {
-                                printk(KERN_WARNING "invalid cio_ignore range "
-                                        "%x.%x.%04x-%x.%x.%04x\n",
-                                        from_id0, from_ssid, from,
-                                        to_id0, to_ssid, to);
+                                printk(KERN_WARNING "cio: invalid cio_ignore "
+                                       "range %x.%x.%04x-%x.%x.%04x\n",
+                                       from_id0, from_ssid, from,
+                                       to_id0, to_ssid, to);
                                 continue;
                         }
-                        pr_debug("blacklist_setup: adding range "
-                                 "from %x.%x.%04x to %x.%x.%04x\n",
-                                 from_id0, from_ssid, from, to_id0, to_ssid, to);
                         blacklist_range (ra, from, to, to_ssid);
                 }
         }
@@ -239,7 +236,7 @@ blacklist_parse_proc_parameters (char *buf)
                  */
                 blacklist_parse_parameters (buf + 4, add);
         } else {
-                printk (KERN_WARNING "cio_ignore: Parse error; \n"
+                printk (KERN_WARNING "cio: cio_ignore: Parse error; \n"
                         KERN_WARNING "try using 'free all|<devno-range>,"
                                      "<devno-range>,...'\n"
                         KERN_WARNING "or 'add <devno-range>,"