Commit 23eb68c5 authored by Cornelia Huck's avatar Cornelia Huck Committed by Martin Schwidefsky
Browse files

[S390] cio: change confusing message in cmf.



cmf currently prints a message that more than 4096 channels are not
allowed in basic mode - however, this can only be enforced if cmf was
a module (which is no longer possible). It makes much more sense to
not check the specified number of channels and just print a message if
the block for basic mode could not be allocated (which may happen for
any number of specified channels).
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 3520c922
...@@ -594,6 +594,9 @@ alloc_cmb (struct ccw_device *cdev) ...@@ -594,6 +594,9 @@ alloc_cmb (struct ccw_device *cdev)
free_pages((unsigned long)mem, get_order(size)); free_pages((unsigned long)mem, get_order(size));
} else if (!mem) { } else if (!mem) {
/* no luck */ /* no luck */
printk(KERN_WARNING "cio: failed to allocate area "
"for measuring %d subchannels\n",
cmb_area.num_channels);
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} else { } else {
...@@ -1279,13 +1282,6 @@ init_cmf(void) ...@@ -1279,13 +1282,6 @@ init_cmf(void)
case CMF_BASIC: case CMF_BASIC:
format_string = "basic"; format_string = "basic";
cmbops = &cmbops_basic; cmbops = &cmbops_basic;
if (cmb_area.num_channels > 4096 || cmb_area.num_channels < 1) {
printk(KERN_ERR "cio: Basic channel measurement "
"facility can only use 1 to 4096 devices\n"
KERN_ERR "when the cmf driver is built"
" as a loadable module\n");
return 1;
}
break; break;
case CMF_EXTENDED: case CMF_EXTENDED:
format_string = "extended"; format_string = "extended";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment