Skip to content

Commit

Permalink
staging: comedi: ni_at_ao: 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 board attach noise 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 ce1eddd commit 6bb3395
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions drivers/staging/comedi/drivers/ni_at_ao.c
Original file line number Diff line number Diff line change
Expand Up @@ -337,22 +337,14 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
const struct atao_board *board = comedi_board(dev);
struct atao_private *devpriv;
struct comedi_subdevice *s;
unsigned long iobase;
int ao_unipolar;
int ret;

iobase = it->options[0];
if (iobase == 0)
iobase = 0x1c0;
ao_unipolar = it->options[3];

printk(KERN_INFO "comedi%d: ni_at_ao: 0x%04lx", dev->minor, iobase);

if (!request_region(iobase, ATAO_SIZE, dev->board_name)) {
printk(" I/O port conflict\n");
return -EIO;
}
dev->iobase = iobase;
ret = comedi_request_region(dev, it->options[0], ATAO_SIZE);
if (ret)
return ret;

devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
Expand Down

0 comments on commit 6bb3395

Please sign in to comment.