aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2007-07-27 06:29:19 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-07-27 06:29:19 -0400
commite556bbbd9d2ff2b158915945ac82e2ac7def4d2f (patch)
tree023ed3bc586284f2acb8e754b9eb4171f54b0f2c
parentb771aeac32a320ac52bc227252103d7d7fc48cad (diff)
[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>
Diffstat
-rw-r--r--drivers/s390/cio/blacklist.c19
-rw-r--r--drivers/s390/cio/ccwgroup.c3
-rw-r--r--drivers/s390/cio/chp.c19
-rw-r--r--drivers/s390/cio/chsc.c16
-rw-r--r--drivers/s390/cio/cio.c13
-rw-r--r--drivers/s390/cio/cmf.c16
-rw-r--r--drivers/s390/cio/css.c11
-rw-r--r--drivers/s390/cio/device.c60
-rw-r--r--drivers/s390/cio/device_fsm.c20
9 files changed, 87 insertions, 90 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,
51 to = from; 51 to = from;
52 52
53 if (from > to || to > __MAX_SUBCHANNEL || ssid > __MAX_SSID) { 53 if (from > to || to > __MAX_SUBCHANNEL || ssid > __MAX_SSID) {
54 printk (KERN_WARNING "Invalid blacklist range " 54 printk (KERN_WARNING "cio: Invalid blacklist range "
55 "0.%x.%04x to 0.%x.%04x, skipping\n", 55 "0.%x.%04x to 0.%x.%04x, skipping\n",
56 ssid, from, ssid, to); 56 ssid, from, ssid, to);
57 return; 57 return;
@@ -119,7 +119,7 @@ blacklist_busid(char **str, int *id0, int *ssid, int *devno)
119 return 0; 119 return 0;
120confused: 120confused:
121 strsep(str, ",\n"); 121 strsep(str, ",\n");
122 printk(KERN_WARNING "Invalid cio_ignore parameter '%s'\n", sav); 122 printk(KERN_WARNING "cio: Invalid cio_ignore parameter '%s'\n", sav);
123 return 1; 123 return 1;
124} 124}
125 125
@@ -166,22 +166,19 @@ blacklist_parse_parameters (char *str, range_action action)
166 continue; 166 continue;
167 } 167 }
168 if (*str == '-') { 168 if (*str == '-') {
169 printk(KERN_WARNING "invalid cio_ignore " 169 printk(KERN_WARNING "cio: invalid cio_ignore "
170 "parameter '%s'\n", 170 "parameter '%s'\n",
171 strsep(&str, ",\n")); 171 strsep(&str, ",\n"));
172 continue; 172 continue;
173 } 173 }
174 if ((from_id0 != to_id0) || 174 if ((from_id0 != to_id0) ||
175 (from_ssid != to_ssid)) { 175 (from_ssid != to_ssid)) {
176 printk(KERN_WARNING "invalid cio_ignore range " 176 printk(KERN_WARNING "cio: invalid cio_ignore "
177 "%x.%x.%04x-%x.%x.%04x\n", 177 "range %x.%x.%04x-%x.%x.%04x\n",
178 from_id0, from_ssid, from, 178 from_id0, from_ssid, from,
179 to_id0, to_ssid, to); 179 to_id0, to_ssid, to);
180 continue; 180 continue;
181 } 181 }
182 pr_debug("blacklist_setup: adding range "
183 "from %x.%x.%04x to %x.%x.%04x\n",
184 from_id0, from_ssid, from, to_id0, to_ssid, to);
185 blacklist_range (ra, from, to, to_ssid); 182 blacklist_range (ra, from, to, to_ssid);
186 } 183 }
187 } 184 }
@@ -239,7 +236,7 @@ blacklist_parse_proc_parameters (char *buf)
239 */ 236 */
240 blacklist_parse_parameters (buf + 4, add); 237 blacklist_parse_parameters (buf + 4, add);
241 } else { 238 } else {
242 printk (KERN_WARNING "cio_ignore: Parse error; \n" 239 printk (KERN_WARNING "cio: cio_ignore: Parse error; \n"
243 KERN_WARNING "try using 'free all|<devno-range>," 240 KERN_WARNING "try using 'free all|<devno-range>,"
244 "<devno-range>,...'\n" 241 "<devno-range>,...'\n"
245 KERN_WARNING "or 'add <devno-range>," 242 KERN_WARNING "or 'add <devno-range>,"
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index e5ccda63e883..b0a18f5176aa 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -359,7 +359,6 @@ ccwgroup_probe (struct device *dev)
359 if ((ret = device_create_file(dev, &dev_attr_online))) 359 if ((ret = device_create_file(dev, &dev_attr_online)))
360 return ret; 360 return ret;
361 361
362 pr_debug("%s: device %s\n", __func__, gdev->dev.bus_id);
363 ret = gdrv->probe ? gdrv->probe(gdev) : -ENODEV; 362 ret = gdrv->probe ? gdrv->probe(gdev) : -ENODEV;
364 if (ret) 363 if (ret)
365 device_remove_file(dev, &dev_attr_online); 364 device_remove_file(dev, &dev_attr_online);
@@ -376,8 +375,6 @@ ccwgroup_remove (struct device *dev)
376 gdev = to_ccwgroupdev(dev); 375 gdev = to_ccwgroupdev(dev);
377 gdrv = to_ccwgroupdrv(dev->driver); 376 gdrv = to_ccwgroupdrv(dev->driver);
378 377
379 pr_debug("%s: device %s\n", __func__, gdev->dev.bus_id);
380
381 device_remove_file(dev, &dev_attr_online); 378 device_remove_file(dev, &dev_attr_online);
382 379
383 if (gdrv && gdrv->remove) 380 if (gdrv && gdrv->remove)
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index b57d93d986c0..920dd71e6434 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -121,14 +121,8 @@ static int s390_vary_chpid(struct chp_id chpid, int on)
121 CIO_TRACE_EVENT( 2, dbf_text); 121 CIO_TRACE_EVENT( 2, dbf_text);
122 122
123 status = chp_get_status(chpid); 123 status = chp_get_status(chpid);
124 if (status < 0) {
125 printk(KERN_ERR "Can't vary unknown chpid %x.%02x\n",
126 chpid.cssid, chpid.id);
127 return -EINVAL;
128 }
129
130 if (!on && !status) { 124 if (!on && !status) {
131 printk(KERN_ERR "chpid %x.%02x is already offline\n", 125 printk(KERN_ERR "cio: chpid %x.%02x is already offline\n",
132 chpid.cssid, chpid.id); 126 chpid.cssid, chpid.id);
133 return -EINVAL; 127 return -EINVAL;
134 } 128 }
@@ -421,21 +415,14 @@ int chp_new(struct chp_id chpid)
421 if (ret) 415 if (ret)
422 goto out_free; 416 goto out_free;
423 } else { 417 } else {
424 static int msg_done;
425
426 if (!msg_done) {
427 printk(KERN_WARNING "cio: Channel measurements not "
428 "available, continuing.\n");
429 msg_done = 1;
430 }
431 chp->cmg = -1; 418 chp->cmg = -1;
432 } 419 }
433 420
434 /* make it known to the system */ 421 /* make it known to the system */
435 ret = device_register(&chp->dev); 422 ret = device_register(&chp->dev);
436 if (ret) { 423 if (ret) {
437 printk(KERN_WARNING "%s: could not register %x.%02x\n", 424 CIO_MSG_EVENT(0, "Could not register chp%x.%02x: %d\n",
438 __func__, chpid.cssid, chpid.id); 425 chpid.cssid, chpid.id, ret);
439 goto out_free; 426 goto out_free;
440 } 427 }
441 ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group); 428 ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group);
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index ea92ac4d6577..b38dc2478541 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -995,8 +995,8 @@ chsc_alloc_sei_area(void)
995{ 995{
996 sei_page = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA); 996 sei_page = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
997 if (!sei_page) 997 if (!sei_page)
998 printk(KERN_WARNING"Can't allocate page for processing of " \ 998 CIO_MSG_EVENT(0, "Can't allocate page for processing of "
999 "chsc machine checks!\n"); 999 "chsc machine checks!\n");
1000 return (sei_page ? 0 : -ENOMEM); 1000 return (sei_page ? 0 : -ENOMEM);
1001} 1001}
1002 1002
@@ -1073,8 +1073,8 @@ chsc_determine_css_characteristics(void)
1073 1073
1074 scsc_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA); 1074 scsc_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
1075 if (!scsc_area) { 1075 if (!scsc_area) {
1076 printk(KERN_WARNING"cio: Was not able to determine available" \ 1076 CIO_MSG_EVENT(0, "Was not able to determine available"
1077 "CHSCs due to no memory.\n"); 1077 "CHSCs due to no memory.\n");
1078 return -ENOMEM; 1078 return -ENOMEM;
1079 } 1079 }
1080 1080
@@ -1083,15 +1083,15 @@ chsc_determine_css_characteristics(void)
1083 1083
1084 result = chsc(scsc_area); 1084 result = chsc(scsc_area);
1085 if (result) { 1085 if (result) {
1086 printk(KERN_WARNING"cio: Was not able to determine " \ 1086 CIO_MSG_EVENT(0, "Was not able to determine available CHSCs, "
1087 "available CHSCs, cc=%i.\n", result); 1087 "cc=%i.\n", result);
1088 result = -EIO; 1088 result = -EIO;
1089 goto exit; 1089 goto exit;
1090 } 1090 }
1091 1091
1092 if (scsc_area->response.code != 1) { 1092 if (scsc_area->response.code != 1) {
1093 printk(KERN_WARNING"cio: Was not able to determine " \ 1093 CIO_MSG_EVENT(0, "Was not able to determine "
1094 "available CHSCs.\n"); 1094 "available CHSCs.\n");
1095 result = -EIO; 1095 result = -EIO;
1096 goto exit; 1096 goto exit;
1097 } 1097 }
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index ea1defba5693..f2708d65be5a 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -47,8 +47,8 @@ cio_setup (char *parm)
47 else if (!strcmp (parm, "no")) 47 else if (!strcmp (parm, "no"))
48 cio_show_msg = 0; 48 cio_show_msg = 0;
49 else 49 else
50 printk (KERN_ERR "cio_setup : invalid cio_msg parameter '%s'", 50 printk(KERN_ERR "cio: cio_setup: "
51 parm); 51 "invalid cio_msg parameter '%s'", parm);
52 return 1; 52 return 1;
53} 53}
54 54
@@ -80,7 +80,6 @@ cio_debug_init (void)
80 goto out_unregister; 80 goto out_unregister;
81 debug_register_view (cio_debug_crw_id, &debug_sprintf_view); 81 debug_register_view (cio_debug_crw_id, &debug_sprintf_view);
82 debug_set_level (cio_debug_crw_id, 2); 82 debug_set_level (cio_debug_crw_id, 2);
83 pr_debug("debugging initialized\n");
84 return 0; 83 return 0;
85 84
86out_unregister: 85out_unregister:
@@ -90,7 +89,7 @@ out_unregister:
90 debug_unregister (cio_debug_trace_id); 89 debug_unregister (cio_debug_trace_id);
91 if (cio_debug_crw_id) 90 if (cio_debug_crw_id)
92 debug_unregister (cio_debug_crw_id); 91 debug_unregister (cio_debug_crw_id);
93 pr_debug("could not initialize debugging\n"); 92 printk(KERN_WARNING"cio: could not initialize debugging\n");
94 return -1; 93 return -1;
95} 94}
96 95
@@ -568,7 +567,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
568 */ 567 */
569 if (sch->st != 0) { 568 if (sch->st != 0) {
570 CIO_DEBUG(KERN_INFO, 0, 569 CIO_DEBUG(KERN_INFO, 0,
571 "Subchannel 0.%x.%04x reports " 570 "cio: Subchannel 0.%x.%04x reports "
572 "non-I/O subchannel type %04X\n", 571 "non-I/O subchannel type %04X\n",
573 sch->schid.ssid, sch->schid.sch_no, sch->st); 572 sch->schid.ssid, sch->schid.sch_no, sch->st);
574 /* We stop here for non-io subchannels. */ 573 /* We stop here for non-io subchannels. */
@@ -601,7 +600,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
601 sch->lpm = sch->schib.pmcw.pam & sch->opm; 600 sch->lpm = sch->schib.pmcw.pam & sch->opm;
602 601
603 CIO_DEBUG(KERN_INFO, 0, 602 CIO_DEBUG(KERN_INFO, 0,
604 "Detected device %04x on subchannel 0.%x.%04X" 603 "cio: Detected device %04x on subchannel 0.%x.%04X"
605 " - PIM = %02X, PAM = %02X, POM = %02X\n", 604 " - PIM = %02X, PAM = %02X, POM = %02X\n",
606 sch->schib.pmcw.dev, sch->schid.ssid, 605 sch->schib.pmcw.dev, sch->schid.ssid,
607 sch->schid.sch_no, sch->schib.pmcw.pim, 606 sch->schid.sch_no, sch->schib.pmcw.pim,
@@ -766,7 +765,7 @@ cio_get_console_sch_no(void)
766 /* unlike in 2.4, we cannot autoprobe here, since 765 /* unlike in 2.4, we cannot autoprobe here, since
767 * the channel subsystem is not fully initialized. 766 * the channel subsystem is not fully initialized.
768 * With some luck, the HWC console can take over */ 767 * With some luck, the HWC console can take over */
769 printk(KERN_WARNING "No ccw console found!\n"); 768 printk(KERN_WARNING "cio: No ccw console found!\n");
770 return -1; 769 return -1;
771 } 770 }
772 return console_irq; 771 return console_irq;
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 28abd697be1a..02fd00b55e1b 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -1185,12 +1185,12 @@ static ssize_t cmb_enable_store(struct device *dev, struct device_attribute *att
1185 case '0': 1185 case '0':
1186 ret = disable_cmf(cdev); 1186 ret = disable_cmf(cdev);
1187 if (ret) 1187 if (ret)
1188 printk(KERN_INFO "disable_cmf failed (%d)\n", ret); 1188 dev_info(&cdev->dev, "disable_cmf failed (%d)\n", ret);
1189 break; 1189 break;
1190 case '1': 1190 case '1':
1191 ret = enable_cmf(cdev); 1191 ret = enable_cmf(cdev);
1192 if (ret && ret != -EBUSY) 1192 if (ret && ret != -EBUSY)
1193 printk(KERN_INFO "enable_cmf failed (%d)\n", ret); 1193 dev_info(&cdev->dev, "enable_cmf failed (%d)\n", ret);
1194 break; 1194 break;
1195 } 1195 }
1196 1196
@@ -1280,10 +1280,10 @@ init_cmf(void)
1280 format_string = "basic"; 1280 format_string = "basic";
1281 cmbops = &cmbops_basic; 1281 cmbops = &cmbops_basic;
1282 if (cmb_area.num_channels > 4096 || cmb_area.num_channels < 1) { 1282 if (cmb_area.num_channels > 4096 || cmb_area.num_channels < 1) {
1283 printk(KERN_ERR "Basic channel measurement facility" 1283 printk(KERN_ERR "cio: Basic channel measurement "
1284 " can only use 1 to 4096 devices\n" 1284 "facility can only use 1 to 4096 devices\n"
1285 KERN_ERR "when the cmf driver is built" 1285 KERN_ERR "when the cmf driver is built"
1286 " as a loadable module\n"); 1286 " as a loadable module\n");
1287 return 1; 1287 return 1;
1288 } 1288 }
1289 break; 1289 break;
@@ -1292,13 +1292,13 @@ init_cmf(void)
1292 cmbops = &cmbops_extended; 1292 cmbops = &cmbops_extended;
1293 break; 1293 break;
1294 default: 1294 default:
1295 printk(KERN_ERR "Invalid format %d for channel " 1295 printk(KERN_ERR "cio: Invalid format %d for channel "
1296 "measurement facility\n", format); 1296 "measurement facility\n", format);
1297 return 1; 1297 return 1;
1298 } 1298 }
1299 1299
1300 printk(KERN_INFO "Channel measurement facility using %s format (%s)\n", 1300 printk(KERN_INFO "cio: Channel measurement facility using %s "
1301 format_string, detect_string); 1301 "format (%s)\n", format_string, detect_string);
1302 return 0; 1302 return 0;
1303} 1303}
1304 1304
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index eb08d63b3dac..ac5ceb933896 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -184,8 +184,8 @@ static int css_register_subchannel(struct subchannel *sch)
184 /* make it known to the system */ 184 /* make it known to the system */
185 ret = css_sch_device_register(sch); 185 ret = css_sch_device_register(sch);
186 if (ret) { 186 if (ret) {
187 printk (KERN_WARNING "%s: could not register %s\n", 187 CIO_MSG_EVENT(0, "Could not register sch 0.%x.%04x: %d\n",
188 __func__, sch->dev.bus_id); 188 sch->schid.ssid, sch->schid.sch_no, ret);
189 return ret; 189 return ret;
190 } 190 }
191 return ret; 191 return ret;
@@ -371,8 +371,7 @@ static int __init slow_subchannel_init(void)
371 spin_lock_init(&slow_subchannel_lock); 371 spin_lock_init(&slow_subchannel_lock);
372 slow_subchannel_set = idset_sch_new(); 372 slow_subchannel_set = idset_sch_new();
373 if (!slow_subchannel_set) { 373 if (!slow_subchannel_set) {
374 printk(KERN_WARNING "cio: could not allocate slow subchannel " 374 CIO_MSG_EVENT(0, "could not allocate slow subchannel set\n");
375 "set\n");
376 return -ENOMEM; 375 return -ENOMEM;
377 } 376 }
378 return 0; 377 return 0;
@@ -425,8 +424,8 @@ static int reprobe_subchannel(struct subchannel_id schid, void *data)
425 struct subchannel *sch; 424 struct subchannel *sch;
426 int ret; 425 int ret;
427 426
428 CIO_DEBUG(KERN_INFO, 6, "cio: reprobe 0.%x.%04x\n", 427 CIO_MSG_EVENT(6, "cio: reprobe 0.%x.%04x\n",
429 schid.ssid, schid.sch_no); 428 schid.ssid, schid.sch_no);
430 if (need_reprobe) 429 if (need_reprobe)
431 return -EAGAIN; 430 return -EAGAIN;
432 431
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 001682e70f67..297659fa0e26 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -338,15 +338,20 @@ ccw_device_remove_disconnected(struct ccw_device *cdev)
338 rc = device_schedule_callback(&cdev->dev, 338 rc = device_schedule_callback(&cdev->dev,
339 ccw_device_remove_orphan_cb); 339 ccw_device_remove_orphan_cb);
340 if (rc) 340 if (rc)
341 dev_info(&cdev->dev, "Couldn't unregister orphan\n"); 341 CIO_MSG_EVENT(2, "Couldn't unregister orphan "
342 "0.%x.%04x\n",
343 cdev->private->dev_id.ssid,
344 cdev->private->dev_id.devno);
342 return; 345 return;
343 } 346 }
344 /* Deregister subchannel, which will kill the ccw device. */ 347 /* Deregister subchannel, which will kill the ccw device. */
345 rc = device_schedule_callback(cdev->dev.parent, 348 rc = device_schedule_callback(cdev->dev.parent,
346 ccw_device_remove_sch_cb); 349 ccw_device_remove_sch_cb);
347 if (rc) 350 if (rc)
348 dev_info(&cdev->dev, 351 CIO_MSG_EVENT(2, "Couldn't unregister disconnected device "
349 "Couldn't unregister disconnected device\n"); 352 "0.%x.%04x\n",
353 cdev->private->dev_id.ssid,
354 cdev->private->dev_id.devno);
350} 355}
351 356
352int 357int
@@ -379,8 +384,10 @@ ccw_device_set_offline(struct ccw_device *cdev)
379 if (ret == 0) 384 if (ret == 0)
380 wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev)); 385 wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
381 else { 386 else {
382 pr_debug("ccw_device_offline returned %d, device %s\n", 387 CIO_MSG_EVENT(2, "ccw_device_offline returned %d, "
383 ret, cdev->dev.bus_id); 388 "device 0.%x.%04x\n",
389 ret, cdev->private->dev_id.ssid,
390 cdev->private->dev_id.devno);
384 cdev->online = 1; 391 cdev->online = 1;
385 } 392 }
386 return ret; 393 return ret;
@@ -402,8 +409,10 @@ ccw_device_set_online(struct ccw_device *cdev)
402 if (ret == 0) 409 if (ret == 0)
403 wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev)); 410 wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
404 else { 411 else {
405 pr_debug("ccw_device_online returned %d, device %s\n", 412 CIO_MSG_EVENT(2, "ccw_device_online returned %d, "
406 ret, cdev->dev.bus_id); 413 "device 0.%x.%04x\n",
414 ret, cdev->private->dev_id.ssid,
415 cdev->private->dev_id.devno);
407 return ret; 416 return ret;
408 } 417 }
409 if (cdev->private->state != DEV_STATE_ONLINE) 418 if (cdev->private->state != DEV_STATE_ONLINE)
@@ -417,9 +426,11 @@ ccw_device_set_online(struct ccw_device *cdev)
417 spin_unlock_irq(cdev->ccwlock); 426 spin_unlock_irq(cdev->ccwlock);
418 if (ret == 0) 427 if (ret == 0)
419 wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev)); 428 wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
420 else 429 else
421 pr_debug("ccw_device_offline returned %d, device %s\n", 430 CIO_MSG_EVENT(2, "ccw_device_offline returned %d, "
422 ret, cdev->dev.bus_id); 431 "device 0.%x.%04x\n",
432 ret, cdev->private->dev_id.ssid,
433 cdev->private->dev_id.devno);
423 return (ret == 0) ? -ENODEV : ret; 434 return (ret == 0) ? -ENODEV : ret;
424} 435}
425 436
@@ -439,9 +450,10 @@ static int online_store_recog_and_online(struct ccw_device *cdev)
439 if (cdev->id.cu_type == 0) { 450 if (cdev->id.cu_type == 0) {
440 ret = ccw_device_recognition(cdev); 451 ret = ccw_device_recognition(cdev);
441 if (ret) { 452 if (ret) {
442 printk(KERN_WARNING"Couldn't start recognition " 453 CIO_MSG_EVENT(0, "Couldn't start recognition "
443 "for device %s (ret=%d)\n", 454 "for device 0.%x.%04x (ret=%d)\n",
444 cdev->dev.bus_id, ret); 455 cdev->private->dev_id.ssid,
456 cdev->private->dev_id.devno, ret);
445 return ret; 457 return ret;
446 } 458 }
447 wait_event(cdev->private->wait_q, 459 wait_event(cdev->private->wait_q,
@@ -461,8 +473,8 @@ static void online_store_handle_online(struct ccw_device *cdev, int force)
461 if (force && cdev->private->state == DEV_STATE_BOXED) { 473 if (force && cdev->private->state == DEV_STATE_BOXED) {
462 ret = ccw_device_stlck(cdev); 474 ret = ccw_device_stlck(cdev);
463 if (ret) { 475 if (ret) {
464 printk(KERN_WARNING"ccw_device_stlck for device %s " 476 dev_warn(&cdev->dev,
465 "returned %d!\n", cdev->dev.bus_id, ret); 477 "ccw_device_stlck returned %d!\n", ret);
466 return; 478 return;
467 } 479 }
468 if (cdev->id.cu_type == 0) 480 if (cdev->id.cu_type == 0)
@@ -893,8 +905,10 @@ io_subchannel_register(struct work_struct *work)
893 ret = device_reprobe(&cdev->dev); 905 ret = device_reprobe(&cdev->dev);
894 if (ret) 906 if (ret)
895 /* We can't do much here. */ 907 /* We can't do much here. */
896 dev_info(&cdev->dev, "device_reprobe() returned" 908 CIO_MSG_EVENT(2, "device_reprobe() returned"
897 " %d\n", ret); 909 " %d for 0.%x.%04x\n", ret,
910 cdev->private->dev_id.ssid,
911 cdev->private->dev_id.devno);
898 } 912 }
899 goto out; 913 goto out;
900 } 914 }
@@ -907,8 +921,9 @@ io_subchannel_register(struct work_struct *work)
907 /* make it known to the system */ 921 /* make it known to the system */
908 ret = ccw_device_register(cdev); 922 ret = ccw_device_register(cdev);
909 if (ret) { 923 if (ret) {
910 printk (KERN_WARNING "%s: could not register %s\n", 924 CIO_MSG_EVENT(0, "Could not register ccw dev 0.%x.%04x: %d\n",
911 __func__, cdev->dev.bus_id); 925 cdev->private->dev_id.ssid,
926 cdev->private->dev_id.devno, ret);
912 put_device(&cdev->dev); 927 put_device(&cdev->dev);
913 spin_lock_irqsave(sch->lock, flags); 928 spin_lock_irqsave(sch->lock, flags);
914 sch->dev.driver_data = NULL; 929 sch->dev.driver_data = NULL;
@@ -1361,7 +1376,6 @@ ccw_device_remove (struct device *dev)
1361 struct ccw_driver *cdrv = cdev->drv; 1376 struct ccw_driver *cdrv = cdev->drv;
1362 int ret; 1377 int ret;
1363 1378
1364 pr_debug("removing device %s\n", cdev->dev.bus_id);
1365 if (cdrv->remove) 1379 if (cdrv->remove)
1366 cdrv->remove(cdev); 1380 cdrv->remove(cdev);
1367 if (cdev->online) { 1381 if (cdev->online) {
@@ -1374,8 +1388,10 @@ ccw_device_remove (struct device *dev)
1374 dev_fsm_final_state(cdev)); 1388 dev_fsm_final_state(cdev));
1375 else 1389 else
1376 //FIXME: we can't fail! 1390 //FIXME: we can't fail!
1377 pr_debug("ccw_device_offline returned %d, device %s\n", 1391 CIO_MSG_EVENT(2, "ccw_device_offline returned %d, "
1378 ret, cdev->dev.bus_id); 1392 "device 0.%x.%04x\n",
1393 ret, cdev->private->dev_id.ssid,
1394 cdev->private->dev_id.devno);
1379 } 1395 }
1380 ccw_device_set_timeout(cdev, 0); 1396 ccw_device_set_timeout(cdev, 0);
1381 cdev->drv = NULL; 1397 cdev->drv = NULL;
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 6bba80929577..8633dc537695 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -268,7 +268,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
268 switch (state) { 268 switch (state) {
269 case DEV_STATE_NOT_OPER: 269 case DEV_STATE_NOT_OPER:
270 CIO_DEBUG(KERN_WARNING, 2, 270 CIO_DEBUG(KERN_WARNING, 2,
271 "SenseID : unknown device %04x on subchannel " 271 "cio: SenseID : unknown device %04x on subchannel "
272 "0.%x.%04x\n", cdev->private->dev_id.devno, 272 "0.%x.%04x\n", cdev->private->dev_id.devno,
273 sch->schid.ssid, sch->schid.sch_no); 273 sch->schid.ssid, sch->schid.sch_no);
274 break; 274 break;
@@ -293,7 +293,8 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
293 return; 293 return;
294 } 294 }
295 /* Issue device info message. */ 295 /* Issue device info message. */
296 CIO_DEBUG(KERN_INFO, 2, "SenseID : device 0.%x.%04x reports: " 296 CIO_DEBUG(KERN_INFO, 2,
297 "cio: SenseID : device 0.%x.%04x reports: "
297 "CU Type/Mod = %04X/%02X, Dev Type/Mod = " 298 "CU Type/Mod = %04X/%02X, Dev Type/Mod = "
298 "%04X/%02X\n", 299 "%04X/%02X\n",
299 cdev->private->dev_id.ssid, 300 cdev->private->dev_id.ssid,
@@ -303,7 +304,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
303 break; 304 break;
304 case DEV_STATE_BOXED: 305 case DEV_STATE_BOXED:
305 CIO_DEBUG(KERN_WARNING, 2, 306 CIO_DEBUG(KERN_WARNING, 2,
306 "SenseID : boxed device %04x on subchannel " 307 "cio: SenseID : boxed device %04x on subchannel "
307 "0.%x.%04x\n", cdev->private->dev_id.devno, 308 "0.%x.%04x\n", cdev->private->dev_id.devno,
308 sch->schid.ssid, sch->schid.sch_no); 309 sch->schid.ssid, sch->schid.sch_no);
309 break; 310 break;
@@ -388,7 +389,7 @@ ccw_device_done(struct ccw_device *cdev, int state)
388 389
389 if (state == DEV_STATE_BOXED) 390 if (state == DEV_STATE_BOXED)
390 CIO_DEBUG(KERN_WARNING, 2, 391 CIO_DEBUG(KERN_WARNING, 2,
391 "Boxed device %04x on subchannel %04x\n", 392 "cio: Boxed device %04x on subchannel %04x\n",
392 cdev->private->dev_id.devno, sch->schid.sch_no); 393 cdev->private->dev_id.devno, sch->schid.sch_no);
393 394
394 if (cdev->private->flags.donotify) { 395 if (cdev->private->flags.donotify) {
@@ -946,9 +947,10 @@ ccw_device_w4sense(struct ccw_device *cdev, enum dev_event dev_event)
946 /* Basic sense hasn't started. Try again. */ 947 /* Basic sense hasn't started. Try again. */
947 ccw_device_do_sense(cdev, irb); 948 ccw_device_do_sense(cdev, irb);
948 else { 949 else {
949 printk(KERN_INFO "Huh? %s(%s): unsolicited " 950 CIO_MSG_EVENT(2, "Huh? 0.%x.%04x: unsolicited "
950 "interrupt...\n", 951 "interrupt during w4sense...\n",
951 __FUNCTION__, cdev->dev.bus_id); 952 cdev->private->dev_id.ssid,
953 cdev->private->dev_id.devno);
952 if (cdev->handler) 954 if (cdev->handler)
953 cdev->handler (cdev, 0, irb); 955 cdev->handler (cdev, 0, irb);
954 } 956 }
@@ -1215,8 +1217,8 @@ ccw_device_nop(struct ccw_device *cdev, enum dev_event dev_event)
1215static void 1217static void
1216ccw_device_bug(struct ccw_device *cdev, enum dev_event dev_event) 1218ccw_device_bug(struct ccw_device *cdev, enum dev_event dev_event)
1217{ 1219{
1218 printk(KERN_EMERG "dev_jumptable[%i][%i] == NULL\n", 1220 CIO_MSG_EVENT(0, "dev_jumptable[%i][%i] == NULL\n",
1219 cdev->private->state, dev_event); 1221 cdev->private->state, dev_event);
1220 BUG(); 1222 BUG();
1221} 1223}
1222 1224
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-29 06:52:31 -0500