diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/s390/cio/blacklist.c | 14 | ||||
-rw-r--r-- | drivers/s390/cio/chsc.c | 8 | ||||
-rw-r--r-- | drivers/s390/cio/cio.c | 5 | ||||
-rw-r--r-- | drivers/s390/cio/cmf.c | 8 | ||||
-rw-r--r-- | drivers/s390/cio/css.c | 8 |
5 files changed, 30 insertions, 13 deletions
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c index 2f547b840ef0..fe00be3675cd 100644 --- a/drivers/s390/cio/blacklist.c +++ b/drivers/s390/cio/blacklist.c | |||
@@ -9,6 +9,9 @@ | |||
9 | * Arnd Bergmann (arndb@de.ibm.com) | 9 | * Arnd Bergmann (arndb@de.ibm.com) |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #define KMSG_COMPONENT "cio" | ||
13 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
14 | |||
12 | #include <linux/init.h> | 15 | #include <linux/init.h> |
13 | #include <linux/vmalloc.h> | 16 | #include <linux/vmalloc.h> |
14 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
@@ -50,9 +53,10 @@ static int blacklist_range(range_action action, unsigned int from_ssid, | |||
50 | { | 53 | { |
51 | if ((from_ssid > to_ssid) || ((from_ssid == to_ssid) && (from > to))) { | 54 | if ((from_ssid > to_ssid) || ((from_ssid == to_ssid) && (from > to))) { |
52 | if (msgtrigger) | 55 | if (msgtrigger) |
53 | printk(KERN_WARNING "cio: Invalid cio_ignore range " | 56 | pr_warning("0.%x.%04x to 0.%x.%04x is not a valid " |
54 | "0.%x.%04x-0.%x.%04x\n", from_ssid, from, | 57 | "range for cio_ignore\n", from_ssid, from, |
55 | to_ssid, to); | 58 | to_ssid, to); |
59 | |||
56 | return 1; | 60 | return 1; |
57 | } | 61 | } |
58 | 62 | ||
@@ -140,8 +144,8 @@ static int parse_busid(char *str, unsigned int *cssid, unsigned int *ssid, | |||
140 | rc = 0; | 144 | rc = 0; |
141 | out: | 145 | out: |
142 | if (rc && msgtrigger) | 146 | if (rc && msgtrigger) |
143 | printk(KERN_WARNING "cio: Invalid cio_ignore device '%s'\n", | 147 | pr_warning("%s is not a valid device for the cio_ignore " |
144 | str); | 148 | "kernel parameter\n", str); |
145 | 149 | ||
146 | return rc; | 150 | return rc; |
147 | } | 151 | } |
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c index 29826fdd47b8..ebab6ea4659b 100644 --- a/drivers/s390/cio/chsc.c +++ b/drivers/s390/cio/chsc.c | |||
@@ -8,6 +8,9 @@ | |||
8 | * Arnd Bergmann (arndb@de.ibm.com) | 8 | * Arnd Bergmann (arndb@de.ibm.com) |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #define KMSG_COMPONENT "cio" | ||
12 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
13 | |||
11 | #include <linux/module.h> | 14 | #include <linux/module.h> |
12 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
13 | #include <linux/init.h> | 16 | #include <linux/init.h> |
@@ -333,6 +336,7 @@ static void chsc_process_sei_chp_config(struct chsc_sei_area *sei_area) | |||
333 | struct chp_config_data *data; | 336 | struct chp_config_data *data; |
334 | struct chp_id chpid; | 337 | struct chp_id chpid; |
335 | int num; | 338 | int num; |
339 | char *events[3] = {"configure", "deconfigure", "cancel deconfigure"}; | ||
336 | 340 | ||
337 | CIO_CRW_EVENT(4, "chsc: channel-path-configuration notification\n"); | 341 | CIO_CRW_EVENT(4, "chsc: channel-path-configuration notification\n"); |
338 | if (sei_area->rs != 0) | 342 | if (sei_area->rs != 0) |
@@ -343,8 +347,8 @@ static void chsc_process_sei_chp_config(struct chsc_sei_area *sei_area) | |||
343 | if (!chp_test_bit(data->map, num)) | 347 | if (!chp_test_bit(data->map, num)) |
344 | continue; | 348 | continue; |
345 | chpid.id = num; | 349 | chpid.id = num; |
346 | printk(KERN_WARNING "cio: processing configure event %d for " | 350 | pr_notice("Processing %s for channel path %x.%02x\n", |
347 | "chpid %x.%02x\n", data->op, chpid.cssid, chpid.id); | 351 | events[data->op], chpid.cssid, chpid.id); |
348 | switch (data->op) { | 352 | switch (data->op) { |
349 | case 0: | 353 | case 0: |
350 | chp_cfg_schedule(chpid, 1); | 354 | chp_cfg_schedule(chpid, 1); |
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index 8f1cec499532..8a8df7552969 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c | |||
@@ -9,6 +9,9 @@ | |||
9 | * Martin Schwidefsky (schwidefsky@de.ibm.com) | 9 | * Martin Schwidefsky (schwidefsky@de.ibm.com) |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #define KMSG_COMPONENT "cio" | ||
13 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
14 | |||
12 | #include <linux/module.h> | 15 | #include <linux/module.h> |
13 | #include <linux/init.h> | 16 | #include <linux/init.h> |
14 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
@@ -814,7 +817,7 @@ cio_probe_console(void) | |||
814 | sch_no = cio_get_console_sch_no(); | 817 | sch_no = cio_get_console_sch_no(); |
815 | if (sch_no == -1) { | 818 | if (sch_no == -1) { |
816 | console_subchannel_in_use = 0; | 819 | console_subchannel_in_use = 0; |
817 | printk(KERN_WARNING "cio: No ccw console found!\n"); | 820 | pr_warning("No CCW console was found\n"); |
818 | return ERR_PTR(-ENODEV); | 821 | return ERR_PTR(-ENODEV); |
819 | } | 822 | } |
820 | memset(&console_subchannel, 0, sizeof(struct subchannel)); | 823 | memset(&console_subchannel, 0, sizeof(struct subchannel)); |
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c index 6ddd02308e14..dc98b2c63862 100644 --- a/drivers/s390/cio/cmf.c +++ b/drivers/s390/cio/cmf.c | |||
@@ -25,6 +25,9 @@ | |||
25 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 25 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #define KMSG_COMPONENT "cio" | ||
29 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
30 | |||
28 | #include <linux/bootmem.h> | 31 | #include <linux/bootmem.h> |
29 | #include <linux/device.h> | 32 | #include <linux/device.h> |
30 | #include <linux/init.h> | 33 | #include <linux/init.h> |
@@ -1322,9 +1325,8 @@ static int __init init_cmf(void) | |||
1322 | default: | 1325 | default: |
1323 | return 1; | 1326 | return 1; |
1324 | } | 1327 | } |
1325 | 1328 | pr_info("Channel measurement facility initialized using format " | |
1326 | printk(KERN_INFO "cio: Channel measurement facility using %s " | 1329 | "%s (mode %s)\n", format_string, detect_string); |
1327 | "format (%s)\n", format_string, detect_string); | ||
1328 | return 0; | 1330 | return 0; |
1329 | } | 1331 | } |
1330 | 1332 | ||
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 1b2d5149de5a..8019288bc6de 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c | |||
@@ -6,6 +6,10 @@ | |||
6 | * Author(s): Arnd Bergmann (arndb@de.ibm.com) | 6 | * Author(s): Arnd Bergmann (arndb@de.ibm.com) |
7 | * Cornelia Huck (cornelia.huck@de.ibm.com) | 7 | * Cornelia Huck (cornelia.huck@de.ibm.com) |
8 | */ | 8 | */ |
9 | |||
10 | #define KMSG_COMPONENT "cio" | ||
11 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
12 | |||
9 | #include <linux/module.h> | 13 | #include <linux/module.h> |
10 | #include <linux/init.h> | 14 | #include <linux/init.h> |
11 | #include <linux/device.h> | 15 | #include <linux/device.h> |
@@ -844,8 +848,8 @@ out: | |||
844 | s390_unregister_crw_handler(CRW_RSC_CSS); | 848 | s390_unregister_crw_handler(CRW_RSC_CSS); |
845 | chsc_free_sei_area(); | 849 | chsc_free_sei_area(); |
846 | kfree(slow_subchannel_set); | 850 | kfree(slow_subchannel_set); |
847 | printk(KERN_WARNING"cio: failed to initialize css driver (%d)!\n", | 851 | pr_alert("The CSS device driver initialization failed with " |
848 | ret); | 852 | "errno=%d\n", ret); |
849 | return ret; | 853 | return ret; |
850 | } | 854 | } |
851 | 855 | ||