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

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
...@@ -396,8 +396,6 @@ static int dev_8255_attach(struct comedi_device *dev, ...@@ -396,8 +396,6 @@ static int dev_8255_attach(struct comedi_device *dev,
unsigned long iobase; unsigned long iobase;
int i; int i;
printk("comedi%d: 8255:", dev->minor);
dev->board_name = "8255"; dev->board_name = "8255";
for (i = 0; i < COMEDI_NDEVCONFOPTS; i++) { for (i = 0; i < COMEDI_NDEVCONFOPTS; i++) {
...@@ -406,13 +404,20 @@ static int dev_8255_attach(struct comedi_device *dev, ...@@ -406,13 +404,20 @@ static int dev_8255_attach(struct comedi_device *dev,
break; break;
} }
if (i == 0) { if (i == 0) {
printk(" no devices specified\n"); printk(KERN_WARNING
"comedi%d: 8255: no devices specified\n", dev->minor);
return -EINVAL; return -EINVAL;
} }
ret = alloc_subdevices(dev, i); 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; return ret;
}
printk(KERN_INFO "comedi%d: 8255:", dev->minor);
for (i = 0; i < dev->n_subdevices; i++) { for (i = 0; i < dev->n_subdevices; i++) {
iobase = it->options[i]; iobase = it->options[i];
...@@ -439,7 +444,7 @@ static int dev_8255_detach(struct comedi_device *dev) ...@@ -439,7 +444,7 @@ static int dev_8255_detach(struct comedi_device *dev)
unsigned long iobase; unsigned long iobase;
struct comedi_subdevice *s; 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++) { for (i = 0; i < dev->n_subdevices; i++) {
s = dev->subdevices + i; s = dev->subdevices + i;
......
Markdown is supported
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