diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-09 16:21:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-11 12:47:50 -0700 |
| commit | c8c90a73808f44dd10bcc2dd4bb6f966bc73cfe0 (patch) | |
| tree | e492deac8a0740299b57373f6e99638e3cb6e324 | |
| parent | a59585145f64da07ee1cfb4377deacdc2c216777 (diff) | |
staging: comedi: aio_iiro_16: use comedi_request_region()
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/aio_iiro_16.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/staging/comedi/drivers/aio_iiro_16.c b/drivers/staging/comedi/drivers/aio_iiro_16.c index 29aba2bb396f..440f47a73835 100644 --- a/drivers/staging/comedi/drivers/aio_iiro_16.c +++ b/drivers/staging/comedi/drivers/aio_iiro_16.c @@ -77,20 +77,12 @@ static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev, static int aio_iiro_16_attach(struct comedi_device *dev, struct comedi_devconfig *it) { - int iobase; struct comedi_subdevice *s; int ret; - printk(KERN_INFO "comedi%d: aio_iiro_16: ", dev->minor); - - iobase = it->options[0]; - - if (!request_region(iobase, AIO_IIRO_16_SIZE, dev->board_name)) { - printk("I/O port conflict"); - return -EIO; - } - - dev->iobase = iobase; + ret = comedi_request_region(dev, it->options[0], AIO_IIRO_16_SIZE); + if (ret) + return ret; ret = comedi_alloc_subdevices(dev, 2); if (ret) @@ -112,8 +104,6 @@ static int aio_iiro_16_attach(struct comedi_device *dev, s->range_table = &range_digital; s->insn_bits = aio_iiro_16_dio_insn_bits_read; - printk("attached\n"); - return 1; } |