Skip to content

Commit

Permalink
Staging: comedi: poc: Checkpatch cleanups
Browse files Browse the repository at this point in the history
This fixes all checkpatch issues in the poc comedi driver.

Signed-off-by: Benjamin Adolphi <b.adolphi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Benjamin Adolphi authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent b1e68ea commit 94941bc
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions drivers/staging/comedi/drivers/poc.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,22 +122,21 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned int iosize;

iobase = it->options[0];
printk("comedi%d: poc: using %s iobase 0x%lx\n", dev->minor,
printk(KERN_INFO "comedi%d: poc: using %s iobase 0x%lx\n", dev->minor,
this_board->name, iobase);

dev->board_name = this_board->name;

if (iobase == 0) {
printk("io base address required\n");
printk(KERN_WARNING "io base address required\n");
return -EINVAL;
}

iosize = this_board->iosize;
/* check if io addresses are available */
if (!request_region(iobase, iosize, "dac02")) {
printk
("I/O port conflict: failed to allocate ports 0x%lx to 0x%lx\n",
iobase, iobase + iosize - 1);
printk(KERN_WARNING "I/O port conflict: failed to allocate "
"ports 0x%lx to 0x%lx\n", iobase, iobase + iosize - 1);
return -EIO;
}
dev->iobase = iobase;
Expand All @@ -156,9 +155,8 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->insn_write = this_board->winsn;
s->insn_read = this_board->rinsn;
s->insn_bits = this_board->insnbits;
if (s->type == COMEDI_SUBD_AO || s->type == COMEDI_SUBD_DO) {
if (s->type == COMEDI_SUBD_AO || s->type == COMEDI_SUBD_DO)
s->subdev_flags = SDF_WRITABLE;
}

return 0;
}
Expand All @@ -169,7 +167,7 @@ static int poc_detach(struct comedi_device *dev)
if (dev->iobase)
release_region(dev->iobase, this_board->iosize);

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

return 0;
}
Expand Down

0 comments on commit 94941bc

Please sign in to comment.