Skip to content

Commit

Permalink
staging: comedi: poc: use comedi_request_region()
Browse files Browse the repository at this point in the history
Use comedi_request_region() to request the I/O region used by this
driver.

Remove the noise when the board is first attached as well as the
error message when the request_region() fails, comedi_request_reqion()
will output the error message if necessary.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 11, 2013
1 parent 7ba2551 commit 07e6ed0
Showing 1 changed file with 3 additions and 19 deletions.
22 changes: 3 additions & 19 deletions drivers/staging/comedi/drivers/poc.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,27 +139,11 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
const struct boarddef_struct *board = comedi_board(dev);
struct poc_private *devpriv;
struct comedi_subdevice *s;
unsigned long iobase;
unsigned int iosize;
int ret;

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

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

iosize = board->iosize;
/* check if io addresses are available */
if (!request_region(iobase, iosize, dev->board_name)) {
printk(KERN_ERR "I/O port conflict: failed to allocate ports "
"0x%lx to 0x%lx\n", iobase, iobase + iosize - 1);
return -EIO;
}
dev->iobase = iobase;
ret = comedi_request_region(dev, it->options[0], board->iosize);
if (ret)
return ret;

ret = comedi_alloc_subdevices(dev, 1);
if (ret)
Expand Down

0 comments on commit 07e6ed0

Please sign in to comment.