Skip to content

Commit

Permalink
Staging: comedi: Altered the way printk is used in 8255.c
Browse files Browse the repository at this point in the history
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: Mark Rankilor <reodge@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Mark authored and Greg Kroah-Hartman committed May 18, 2010
1 parent 5763dca commit 0263869
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions drivers/staging/comedi/drivers/8255.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand All @@ -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];
Expand All @@ -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;
Expand Down

0 comments on commit 0263869

Please sign in to comment.