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

[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: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent b771aeac

drivers/s390/cio/blacklist.c

+8 −11
Original line number Diff line number Diff line
@@ -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",

				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>,"

drivers/s390/cio/ccwgroup.c

+0 −3
Original line number Diff line number Diff line
@@ -359,7 +359,6 @@ ccwgroup_probe (struct device *dev) 
	if ((ret = device_create_file(dev, &dev_attr_online)))

		return ret;



	pr_debug("%s: device %s\n", __func__, gdev->dev.bus_id);

	ret = gdrv->probe ? gdrv->probe(gdev) : -ENODEV;

	if (ret)

		device_remove_file(dev, &dev_attr_online);
@@ -376,8 +375,6 @@ ccwgroup_remove (struct device *dev) 
	gdev = to_ccwgroupdev(dev);

	gdrv = to_ccwgroupdrv(dev->driver);



	pr_debug("%s: device %s\n", __func__, gdev->dev.bus_id);



	device_remove_file(dev, &dev_attr_online);



	if (gdrv && gdrv->remove)

drivers/s390/cio/chp.c

+3 −16
Original line number Diff line number Diff line
@@ -121,14 +121,8 @@ static int s390_vary_chpid(struct chp_id chpid, int on) 
	CIO_TRACE_EVENT( 2, dbf_text);



	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) {

		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);

		return -EINVAL;

	}
@@ -421,21 +415,14 @@ int chp_new(struct chp_id chpid) 
		if (ret)

			goto out_free;

	} else {

		static int msg_done;



		if (!msg_done) {

			printk(KERN_WARNING "cio: Channel measurements not "

			       "available, continuing.\n");

			msg_done = 1;

		}

		chp->cmg = -1;

	}



	/* make it known to the system */

	ret = device_register(&chp->dev);

	if (ret) {

		printk(KERN_WARNING "%s: could not register %x.%02x\n",

		       __func__, chpid.cssid, chpid.id);

		CIO_MSG_EVENT(0, "Could not register chp%x.%02x: %d\n",

			      chpid.cssid, chpid.id, ret);

		goto out_free;

	}

	ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group);

drivers/s390/cio/chsc.c

+8 −8
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ chsc_alloc_sei_area(void) 
{

	sei_page = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);

	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");

	return (sei_page ? 0 : -ENOMEM);

}
@@ -1073,7 +1073,7 @@ chsc_determine_css_characteristics(void) 


	scsc_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);

	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");

		return -ENOMEM;

	}
@@ -1083,14 +1083,14 @@ chsc_determine_css_characteristics(void) 


	result = chsc(scsc_area);

	if (result) {

		printk(KERN_WARNING"cio: Was not able to determine " \

		       "available CHSCs, cc=%i.\n", result);

		CIO_MSG_EVENT(0, "Was not able to determine available CHSCs, "

			      "cc=%i.\n", result);

		result = -EIO;

		goto exit;

	}



	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");

		result = -EIO;

		goto exit;

drivers/s390/cio/cio.c

+6 −7
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ cio_setup (char *parm) 
	else if (!strcmp (parm, "no"))

		cio_show_msg = 0;

	else

		printk (KERN_ERR "cio_setup : invalid cio_msg parameter '%s'",

			parm);

		printk(KERN_ERR "cio: cio_setup: "

		       "invalid cio_msg parameter '%s'", parm);

	return 1;

}
@@ -80,7 +80,6 @@ cio_debug_init (void) 
		goto out_unregister;

	debug_register_view (cio_debug_crw_id, &debug_sprintf_view);

	debug_set_level (cio_debug_crw_id, 2);

	pr_debug("debugging initialized\n");

	return 0;



out_unregister:
@@ -90,7 +89,7 @@ out_unregister: 
		debug_unregister (cio_debug_trace_id);

	if (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;

}
@@ -568,7 +567,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid) 
	 */

	if (sch->st != 0) {

		CIO_DEBUG(KERN_INFO, 0,

			  "Subchannel 0.%x.%04x reports "

			  "cio: Subchannel 0.%x.%04x reports "

			  "non-I/O subchannel type %04X\n",

			  sch->schid.ssid, sch->schid.sch_no, sch->st);

		/* 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;



	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",

		  sch->schib.pmcw.dev, sch->schid.ssid,

		  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

		 * the channel subsystem is not fully initialized.

		 * 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 console_irq;

CRA Git | Maintained and supported by SUSTech CRA and CCSE