redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[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>
wifi-calibration
Cornelia Huck 2007-07-27 12:29:19 +02:00 committed by Martin Schwidefsky
parent b771aeac32
commit e556bbbd9d
9 changed files with 87 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/s390/cio/blacklist.c
View File

@ -51,7 +51,7 @@ blacklist_range (range_action action, unsigned int from, unsigned int to,
to = from; to = from;
if (from > to || to > __MAX_SUBCHANNEL || ssid > __MAX_SSID) { 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", "0.%x.%04x to 0.%x.%04x, skipping\n",
ssid, from, ssid, to); ssid, from, ssid, to);
return; return;
@ -119,7 +119,7 @@ blacklist_busid(char **str, int *id0, int *ssid, int *devno)
return 0; return 0;
confused: confused:
strsep(str, ",\n"); 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; return 1;
} }
@ -166,22 +166,19 @@ blacklist_parse_parameters (char *str, range_action action)
continue; continue;
} }
if (*str == '-') { if (*str == '-') {
printk(KERN_WARNING "invalid cio_ignore " printk(KERN_WARNING "cio: invalid cio_ignore "
"parameter '%s'\n", "parameter '%s'\n",
strsep(&str, ",\n")); strsep(&str, ",\n"));
continue; continue;
} }
if ((from_id0 != to_id0) || if ((from_id0 != to_id0) ||
(from_ssid != to_ssid)) { (from_ssid != to_ssid)) {
printk(KERN_WARNING "invalid cio_ignore range " printk(KERN_WARNING "cio: invalid cio_ignore "
"%x.%x.%04x-%x.%x.%04x\n", "range %x.%x.%04x-%x.%x.%04x\n",
from_id0, from_ssid, from, from_id0, from_ssid, from,
to_id0, to_ssid, to); to_id0, to_ssid, to);
continue; 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); blacklist_range (ra, from, to, to_ssid);
} }
} }
@ -239,7 +236,7 @@ blacklist_parse_proc_parameters (char *buf)
*/ */
blacklist_parse_parameters (buf + 4, add); blacklist_parse_parameters (buf + 4, add);
} else { } 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>," KERN_WARNING "try using 'free all|<devno-range>,"
"<devno-range>,...'\n" "<devno-range>,...'\n"
KERN_WARNING "or 'add <devno-range>," KERN_WARNING "or 'add <devno-range>,"

3
drivers/s390/cio/ccwgroup.c
View File

@ -359,7 +359,6 @@ ccwgroup_probe (struct device *dev)
if ((ret = device_create_file(dev, &dev_attr_online))) if ((ret = device_create_file(dev, &dev_attr_online)))
return ret; return ret;
pr_debug("%s: device %s\n", __func__, gdev->dev.bus_id);
ret = gdrv->probe ? gdrv->probe(gdev) : -ENODEV; ret = gdrv->probe ? gdrv->probe(gdev) : -ENODEV;
if (ret) if (ret)
device_remove_file(dev, &dev_attr_online); device_remove_file(dev, &dev_attr_online);
@ -376,8 +375,6 @@ ccwgroup_remove (struct device *dev)
gdev = to_ccwgroupdev(dev); gdev = to_ccwgroupdev(dev);
gdrv = to_ccwgroupdrv(dev->driver); gdrv = to_ccwgroupdrv(dev->driver);
pr_debug("%s: device %s\n", __func__, gdev->dev.bus_id);
device_remove_file(dev, &dev_attr_online); device_remove_file(dev, &dev_attr_online);
if (gdrv && gdrv->remove) if (gdrv && gdrv->remove)

19
drivers/s390/cio/chp.c
View File

@ -121,14 +121,8 @@ static int s390_vary_chpid(struct chp_id chpid, int on)
CIO_TRACE_EVENT( 2, dbf_text); CIO_TRACE_EVENT( 2, dbf_text);
status = chp_get_status(chpid); status = chp_get_status(chpid);
if (status < 0) {
printk(KERN_ERR "Can't vary unknown chpid %x.%02x\n",
chpid.cssid, chpid.id);
return -EINVAL;
}
if (!on && !status) { if (!on && !status) {
printk(KERN_ERR "chpid %x.%02x is already offline\n", printk(KERN_ERR "cio: chpid %x.%02x is already offline\n",
chpid.cssid, chpid.id); chpid.cssid, chpid.id);
return -EINVAL; return -EINVAL;
} }
@ -421,21 +415,14 @@ int chp_new(struct chp_id chpid)
if (ret) if (ret)
goto out_free; goto out_free;
} else { } else {
static int msg_done;
if (!msg_done) {
printk(KERN_WARNING "cio: Channel measurements not "
"available, continuing.\n");
msg_done = 1;
}
chp->cmg = -1; chp->cmg = -1;
} }
/* make it known to the system */ /* make it known to the system */
ret = device_register(&chp->dev); ret = device_register(&chp->dev);
if (ret) { if (ret) {
printk(KERN_WARNING "%s: could not register %x.%02x\n", CIO_MSG_EVENT(0, "Could not register chp%x.%02x: %d\n",
__func__, chpid.cssid, chpid.id); chpid.cssid, chpid.id, ret);
goto out_free; goto out_free;
} }
ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group); ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group);

16
drivers/s390/cio/chsc.c
View File

@ -995,8 +995,8 @@ chsc_alloc_sei_area(void)
{ {
sei_page = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA); sei_page = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
if (!sei_page) if (!sei_page)
printk(KERN_WARNING"Can't allocate page for processing of " \ CIO_MSG_EVENT(0, "Can't allocate page for processing of "
"chsc machine checks!\n"); "chsc machine checks!\n");
return (sei_page ? 0 : -ENOMEM); return (sei_page ? 0 : -ENOMEM);
} }
@ -1073,8 +1073,8 @@ chsc_determine_css_characteristics(void)
scsc_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA); scsc_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
if (!scsc_area) { if (!scsc_area) {
printk(KERN_WARNING"cio: Was not able to determine available" \ CIO_MSG_EVENT(0, "Was not able to determine available"
"CHSCs due to no memory.\n"); "CHSCs due to no memory.\n");
return -ENOMEM; return -ENOMEM;
} }
@ -1083,15 +1083,15 @@ chsc_determine_css_characteristics(void)
result = chsc(scsc_area); result = chsc(scsc_area);
if (result) { if (result) {
printk(KERN_WARNING"cio: Was not able to determine " \ CIO_MSG_EVENT(0, "Was not able to determine available CHSCs, "
"available CHSCs, cc=%i.\n", result); "cc=%i.\n", result);
result = -EIO; result = -EIO;
goto exit; goto exit;
} }
if (scsc_area->response.code != 1) { if (scsc_area->response.code != 1) {
printk(KERN_WARNING"cio: Was not able to determine " \ CIO_MSG_EVENT(0, "Was not able to determine "
"available CHSCs.\n"); "available CHSCs.\n");
result = -EIO; result = -EIO;
goto exit; goto exit;
} }

13
drivers/s390/cio/cio.c
View File

@ -47,8 +47,8 @@ cio_setup (char *parm)
else if (!strcmp (parm, "no")) else if (!strcmp (parm, "no"))
cio_show_msg = 0; cio_show_msg = 0;
else else
printk (KERN_ERR "cio_setup : invalid cio_msg parameter '%s'", printk(KERN_ERR "cio: cio_setup: "
parm); "invalid cio_msg parameter '%s'", parm);
return 1; return 1;
} }
@ -80,7 +80,6 @@ cio_debug_init (void)
goto out_unregister; goto out_unregister;
debug_register_view (cio_debug_crw_id, &debug_sprintf_view); debug_register_view (cio_debug_crw_id, &debug_sprintf_view);
debug_set_level (cio_debug_crw_id, 2); debug_set_level (cio_debug_crw_id, 2);
pr_debug("debugging initialized\n");
return 0; return 0;
out_unregister: out_unregister:
@ -90,7 +89,7 @@ out_unregister:
debug_unregister (cio_debug_trace_id); debug_unregister (cio_debug_trace_id);
if (cio_debug_crw_id) if (cio_debug_crw_id)
debug_unregister (cio_debug_crw_id); debug_unregister (cio_debug_crw_id);
pr_debug("could not initialize debugging\n"); printk(KERN_WARNING"cio: could not initialize debugging\n");
return -1; return -1;
} }
@ -568,7 +567,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
*/ */
if (sch->st != 0) { if (sch->st != 0) {
CIO_DEBUG(KERN_INFO, 0, CIO_DEBUG(KERN_INFO, 0,
"Subchannel 0.%x.%04x reports " "cio: Subchannel 0.%x.%04x reports "
"non-I/O subchannel type %04X\n", "non-I/O subchannel type %04X\n",
sch->schid.ssid, sch->schid.sch_no, sch->st); sch->schid.ssid, sch->schid.sch_no, sch->st);
/* We stop here for non-io subchannels. */ /* We stop here for non-io subchannels. */
@ -601,7 +600,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
sch->lpm = sch->schib.pmcw.pam & sch->opm; sch->lpm = sch->schib.pmcw.pam & sch->opm;
CIO_DEBUG(KERN_INFO, 0, CIO_DEBUG(KERN_INFO, 0,
"Detected device %04x on subchannel 0.%x.%04X" "cio: Detected device %04x on subchannel 0.%x.%04X"
" - PIM = %02X, PAM = %02X, POM = %02X\n", " - PIM = %02X, PAM = %02X, POM = %02X\n",
sch->schib.pmcw.dev, sch->schid.ssid, sch->schib.pmcw.dev, sch->schid.ssid,
sch->schid.sch_no, sch->schib.pmcw.pim, sch->schid.sch_no, sch->schib.pmcw.pim,
@ -766,7 +765,7 @@ cio_get_console_sch_no(void)
/* unlike in 2.4, we cannot autoprobe here, since /* unlike in 2.4, we cannot autoprobe here, since
* the channel subsystem is not fully initialized. * the channel subsystem is not fully initialized.
* With some luck, the HWC console can take over */ * With some luck, the HWC console can take over */
printk(KERN_WARNING "No ccw console found!\n"); printk(KERN_WARNING "cio: No ccw console found!\n");
return -1; return -1;
} }
return console_irq; return console_irq;

16
drivers/s390/cio/cmf.c
View File

@ -1185,12 +1185,12 @@ static ssize_t cmb_enable_store(struct device *dev, struct device_attribute *att
case '0': case '0':
ret = disable_cmf(cdev); ret = disable_cmf(cdev);
if (ret) if (ret)
printk(KERN_INFO "disable_cmf failed (%d)\n", ret); dev_info(&cdev->dev, "disable_cmf failed (%d)\n", ret);
break; break;
case '1': case '1':
ret = enable_cmf(cdev); ret = enable_cmf(cdev);
if (ret && ret != -EBUSY) if (ret && ret != -EBUSY)
printk(KERN_INFO "enable_cmf failed (%d)\n", ret); dev_info(&cdev->dev, "enable_cmf failed (%d)\n", ret);
break; break;
} }
@ -1280,10 +1280,10 @@ init_cmf(void)
format_string = "basic"; format_string = "basic";
cmbops = &cmbops_basic; cmbops = &cmbops_basic;
if (cmb_area.num_channels > 4096 || cmb_area.num_channels < 1) { if (cmb_area.num_channels > 4096 || cmb_area.num_channels < 1) {
printk(KERN_ERR "Basic channel measurement facility" printk(KERN_ERR "cio: Basic channel measurement "
" can only use 1 to 4096 devices\n" "facility can only use 1 to 4096 devices\n"
KERN_ERR "when the cmf driver is built" KERN_ERR "when the cmf driver is built"
" as a loadable module\n"); " as a loadable module\n");
return 1; return 1;
} }
break; break;
@ -1292,13 +1292,13 @@ init_cmf(void)
cmbops = &cmbops_extended; cmbops = &cmbops_extended;
break; break;
default: default:
printk(KERN_ERR "Invalid format %d for channel " printk(KERN_ERR "cio: Invalid format %d for channel "
"measurement facility\n", format); "measurement facility\n", format);
return 1; return 1;
} }
printk(KERN_INFO "Channel measurement facility using %s format (%s)\n", printk(KERN_INFO "cio: Channel measurement facility using %s "
format_string, detect_string); "format (%s)\n", format_string, detect_string);
return 0; return 0;
} }

11
drivers/s390/cio/css.c
View File

@ -184,8 +184,8 @@ static int css_register_subchannel(struct subchannel *sch)
/* make it known to the system */ /* make it known to the system */
ret = css_sch_device_register(sch); ret = css_sch_device_register(sch);
if (ret) { if (ret) {
printk (KERN_WARNING "%s: could not register %s\n", CIO_MSG_EVENT(0, "Could not register sch 0.%x.%04x: %d\n",
__func__, sch->dev.bus_id); sch->schid.ssid, sch->schid.sch_no, ret);
return ret; return ret;
} }
return ret; return ret;
@ -371,8 +371,7 @@ static int __init slow_subchannel_init(void)
spin_lock_init(&slow_subchannel_lock); spin_lock_init(&slow_subchannel_lock);
slow_subchannel_set = idset_sch_new(); slow_subchannel_set = idset_sch_new();
if (!slow_subchannel_set) { if (!slow_subchannel_set) {
printk(KERN_WARNING "cio: could not allocate slow subchannel " CIO_MSG_EVENT(0, "could not allocate slow subchannel set\n");
"set\n");
return -ENOMEM; return -ENOMEM;
} }
return 0; return 0;
@ -425,8 +424,8 @@ static int reprobe_subchannel(struct subchannel_id schid, void *data)
struct subchannel *sch; struct subchannel *sch;
int ret; int ret;
CIO_DEBUG(KERN_INFO, 6, "cio: reprobe 0.%x.%04x\n", CIO_MSG_EVENT(6, "cio: reprobe 0.%x.%04x\n",
schid.ssid, schid.sch_no); schid.ssid, schid.sch_no);
if (need_reprobe) if (need_reprobe)
return -EAGAIN; return -EAGAIN;

60
drivers/s390/cio/device.c
View File

@ -338,15 +338,20 @@ ccw_device_remove_disconnected(struct ccw_device *cdev)
rc = device_schedule_callback(&cdev->dev, rc = device_schedule_callback(&cdev->dev,
ccw_device_remove_orphan_cb); ccw_device_remove_orphan_cb);
if (rc) if (rc)
dev_info(&cdev->dev, "Couldn't unregister orphan\n"); CIO_MSG_EVENT(2, "Couldn't unregister orphan "
"0.%x.%04x\n",
cdev->private->dev_id.ssid,
cdev->private->dev_id.devno);
return; return;
} }
/* Deregister subchannel, which will kill the ccw device. */ /* Deregister subchannel, which will kill the ccw device. */
rc = device_schedule_callback(cdev->dev.parent, rc = device_schedule_callback(cdev->dev.parent,
ccw_device_remove_sch_cb); ccw_device_remove_sch_cb);
if (rc) if (rc)
dev_info(&cdev->dev, CIO_MSG_EVENT(2, "Couldn't unregister disconnected device "
"Couldn't unregister disconnected device\n"); "0.%x.%04x\n",
cdev->private->dev_id.ssid,
cdev->private->dev_id.devno);
} }
int int
@ -379,8 +384,10 @@ ccw_device_set_offline(struct ccw_device *cdev)
if (ret == 0) if (ret == 0)
wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev)); wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
else { else {
pr_debug("ccw_device_offline returned %d, device %s\n", CIO_MSG_EVENT(2, "ccw_device_offline returned %d, "
ret, cdev->dev.bus_id); "device 0.%x.%04x\n",
ret, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno);
cdev->online = 1; cdev->online = 1;
} }
return ret; return ret;
@ -402,8 +409,10 @@ ccw_device_set_online(struct ccw_device *cdev)
if (ret == 0) if (ret == 0)
wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev)); wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
else { else {
pr_debug("ccw_device_online returned %d, device %s\n", CIO_MSG_EVENT(2, "ccw_device_online returned %d, "
ret, cdev->dev.bus_id); "device 0.%x.%04x\n",
ret, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno);
return ret; return ret;
} }
if (cdev->private->state != DEV_STATE_ONLINE) if (cdev->private->state != DEV_STATE_ONLINE)
@ -417,9 +426,11 @@ ccw_device_set_online(struct ccw_device *cdev)
spin_unlock_irq(cdev->ccwlock); spin_unlock_irq(cdev->ccwlock);
if (ret == 0) if (ret == 0)
wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev)); wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
else else
pr_debug("ccw_device_offline returned %d, device %s\n", CIO_MSG_EVENT(2, "ccw_device_offline returned %d, "
ret, cdev->dev.bus_id); "device 0.%x.%04x\n",
ret, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno);
return (ret == 0) ? -ENODEV : ret; return (ret == 0) ? -ENODEV : ret;
} }
@ -439,9 +450,10 @@ static int online_store_recog_and_online(struct ccw_device *cdev)
if (cdev->id.cu_type == 0) { if (cdev->id.cu_type == 0) {
ret = ccw_device_recognition(cdev); ret = ccw_device_recognition(cdev);
if (ret) { if (ret) {
printk(KERN_WARNING"Couldn't start recognition " CIO_MSG_EVENT(0, "Couldn't start recognition "
"for device %s (ret=%d)\n", "for device 0.%x.%04x (ret=%d)\n",
cdev->dev.bus_id, ret); cdev->private->dev_id.ssid,
cdev->private->dev_id.devno, ret);
return ret; return ret;
} }
wait_event(cdev->private->wait_q, wait_event(cdev->private->wait_q,
@ -461,8 +473,8 @@ static void online_store_handle_online(struct ccw_device *cdev, int force)
if (force && cdev->private->state == DEV_STATE_BOXED) { if (force && cdev->private->state == DEV_STATE_BOXED) {
ret = ccw_device_stlck(cdev); ret = ccw_device_stlck(cdev);
if (ret) { if (ret) {
printk(KERN_WARNING"ccw_device_stlck for device %s " dev_warn(&cdev->dev,
"returned %d!\n", cdev->dev.bus_id, ret); "ccw_device_stlck returned %d!\n", ret);
return; return;
} }
if (cdev->id.cu_type == 0) if (cdev->id.cu_type == 0)
@ -893,8 +905,10 @@ io_subchannel_register(struct work_struct *work)
ret = device_reprobe(&cdev->dev); ret = device_reprobe(&cdev->dev);
if (ret) if (ret)
/* We can't do much here. */ /* We can't do much here. */
dev_info(&cdev->dev, "device_reprobe() returned" CIO_MSG_EVENT(2, "device_reprobe() returned"
" %d\n", ret); " %d for 0.%x.%04x\n", ret,
cdev->private->dev_id.ssid,
cdev->private->dev_id.devno);
} }
goto out; goto out;
} }
@ -907,8 +921,9 @@ io_subchannel_register(struct work_struct *work)
/* make it known to the system */ /* make it known to the system */
ret = ccw_device_register(cdev); ret = ccw_device_register(cdev);
if (ret) { if (ret) {
printk (KERN_WARNING "%s: could not register %s\n", CIO_MSG_EVENT(0, "Could not register ccw dev 0.%x.%04x: %d\n",
__func__, cdev->dev.bus_id); cdev->private->dev_id.ssid,
cdev->private->dev_id.devno, ret);
put_device(&cdev->dev); put_device(&cdev->dev);
spin_lock_irqsave(sch->lock, flags); spin_lock_irqsave(sch->lock, flags);
sch->dev.driver_data = NULL; sch->dev.driver_data = NULL;
@ -1361,7 +1376,6 @@ ccw_device_remove (struct device *dev)
struct ccw_driver *cdrv = cdev->drv; struct ccw_driver *cdrv = cdev->drv;
int ret; int ret;
pr_debug("removing device %s\n", cdev->dev.bus_id);
if (cdrv->remove) if (cdrv->remove)
cdrv->remove(cdev); cdrv->remove(cdev);
if (cdev->online) { if (cdev->online) {
@ -1374,8 +1388,10 @@ ccw_device_remove (struct device *dev)
dev_fsm_final_state(cdev)); dev_fsm_final_state(cdev));
else else
//FIXME: we can't fail! //FIXME: we can't fail!
pr_debug("ccw_device_offline returned %d, device %s\n", CIO_MSG_EVENT(2, "ccw_device_offline returned %d, "
ret, cdev->dev.bus_id); "device 0.%x.%04x\n",
ret, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno);
} }
ccw_device_set_timeout(cdev, 0); ccw_device_set_timeout(cdev, 0);
cdev->drv = NULL; cdev->drv = NULL;

20
drivers/s390/cio/device_fsm.c
View File

@ -268,7 +268,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
switch (state) { switch (state) {
case DEV_STATE_NOT_OPER: case DEV_STATE_NOT_OPER:
CIO_DEBUG(KERN_WARNING, 2, CIO_DEBUG(KERN_WARNING, 2,
"SenseID : unknown device %04x on subchannel " "cio: SenseID : unknown device %04x on subchannel "
"0.%x.%04x\n", cdev->private->dev_id.devno, "0.%x.%04x\n", cdev->private->dev_id.devno,
sch->schid.ssid, sch->schid.sch_no); sch->schid.ssid, sch->schid.sch_no);
break; break;
@ -293,7 +293,8 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
return; return;
} }
/* Issue device info message. */ /* Issue device info message. */
CIO_DEBUG(KERN_INFO, 2, "SenseID : device 0.%x.%04x reports: " CIO_DEBUG(KERN_INFO, 2,
"cio: SenseID : device 0.%x.%04x reports: "
"CU Type/Mod = %04X/%02X, Dev Type/Mod = " "CU Type/Mod = %04X/%02X, Dev Type/Mod = "
"%04X/%02X\n", "%04X/%02X\n",
cdev->private->dev_id.ssid, cdev->private->dev_id.ssid,
@ -303,7 +304,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
break; break;
case DEV_STATE_BOXED: case DEV_STATE_BOXED:
CIO_DEBUG(KERN_WARNING, 2, CIO_DEBUG(KERN_WARNING, 2,
"SenseID : boxed device %04x on subchannel " "cio: SenseID : boxed device %04x on subchannel "
"0.%x.%04x\n", cdev->private->dev_id.devno, "0.%x.%04x\n", cdev->private->dev_id.devno,
sch->schid.ssid, sch->schid.sch_no); sch->schid.ssid, sch->schid.sch_no);
break; break;
@ -388,7 +389,7 @@ ccw_device_done(struct ccw_device *cdev, int state)
if (state == DEV_STATE_BOXED) if (state == DEV_STATE_BOXED)
CIO_DEBUG(KERN_WARNING, 2, CIO_DEBUG(KERN_WARNING, 2,
"Boxed device %04x on subchannel %04x\n", "cio: Boxed device %04x on subchannel %04x\n",
cdev->private->dev_id.devno, sch->schid.sch_no); cdev->private->dev_id.devno, sch->schid.sch_no);
if (cdev->private->flags.donotify) { if (cdev->private->flags.donotify) {
@ -946,9 +947,10 @@ ccw_device_w4sense(struct ccw_device *cdev, enum dev_event dev_event)
/* Basic sense hasn't started. Try again. */ /* Basic sense hasn't started. Try again. */
ccw_device_do_sense(cdev, irb); ccw_device_do_sense(cdev, irb);
else { else {
printk(KERN_INFO "Huh? %s(%s): unsolicited " CIO_MSG_EVENT(2, "Huh? 0.%x.%04x: unsolicited "
"interrupt...\n", "interrupt during w4sense...\n",
__FUNCTION__, cdev->dev.bus_id); cdev->private->dev_id.ssid,
cdev->private->dev_id.devno);
if (cdev->handler) if (cdev->handler)
cdev->handler (cdev, 0, irb); cdev->handler (cdev, 0, irb);
} }
@ -1215,8 +1217,8 @@ ccw_device_nop(struct ccw_device *cdev, enum dev_event dev_event)
static void static void
ccw_device_bug(struct ccw_device *cdev, enum dev_event dev_event) ccw_device_bug(struct ccw_device *cdev, enum dev_event dev_event)
{ {
printk(KERN_EMERG "dev_jumptable[%i][%i] == NULL\n", CIO_MSG_EVENT(0, "dev_jumptable[%i][%i] == NULL\n",
cdev->private->state, dev_event); cdev->private->state, dev_event);
BUG(); BUG();
} }