Commit 02638697 authored by Mark's avatar Mark Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: Altered the way printk is used in 8255.c



This patch moves around the use of printk calls in 8255.c to include accurate
logging levels and in turn fixes a few warnings from checkpatch.

Signed-off-by: default avatarMark Rankilor <reodge@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5763dcab
Loading
Loading
Loading
Loading
+10 −5
Original line number Diff line number Diff line
@@ -396,8 +396,6 @@ static int dev_8255_attach(struct comedi_device *dev,
	unsigned long iobase;
	int i;

	printk("comedi%d: 8255:", dev->minor);

	dev->board_name = "8255";

	for (i = 0; i < COMEDI_NDEVCONFOPTS; i++) {
@@ -406,13 +404,20 @@ static int dev_8255_attach(struct comedi_device *dev,
			break;
	}
	if (i == 0) {
		printk(" no devices specified\n");
		printk(KERN_WARNING
		       "comedi%d: 8255: no devices specified\n", dev->minor);
		return -EINVAL;
	}

	ret = alloc_subdevices(dev, i);
	if (ret < 0)
	if (ret < 0) {
		/* FIXME this printk call should give a proper message, the
		 * below line just maintains previous functionality */
		printk("comedi%d: 8255:", dev->minor);
		return ret;
	}

	printk(KERN_INFO "comedi%d: 8255:", dev->minor);

	for (i = 0; i < dev->n_subdevices; i++) {
		iobase = it->options[i];
@@ -439,7 +444,7 @@ static int dev_8255_detach(struct comedi_device *dev)
	unsigned long iobase;
	struct comedi_subdevice *s;

	printk("comedi%d: 8255: remove\n", dev->minor);
	printk(KERN_INFO "comedi%d: 8255: remove\n", dev->minor);

	for (i = 0; i < dev->n_subdevices; i++) {
		s = dev->subdevices + i;