diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-09 16:20:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-11 12:47:40 -0700 |
| commit | 364e3a87f5759969cc287200c1cb5ba6151b5ba2 (patch) | |
| tree | 993c9ea94b7ddedccdbc9284587614e643eb86ab | |
| parent | 25829c646e11dda92a5b3628b21fe852681fec44 (diff) | |
staging: comedi: dt282x: use comedi_request_region()
Use comedi_request_region() to request the I/O region used by this
driver.
Remove the default iobase address (0x240) that is used when the user
does not pass a base address during the "comedi_config". Comedi
legacy drivers should only attach to a specified address.
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/dt282x.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c index 19f0b999704f..06610453ef63 100644 --- a/drivers/staging/comedi/drivers/dt282x.c +++ b/drivers/staging/comedi/drivers/dt282x.c @@ -1123,18 +1123,10 @@ static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it) int i, irq; int ret; struct comedi_subdevice *s; - unsigned long iobase; - iobase = it->options[opt_iobase]; - if (!iobase) - iobase = 0x240; - - printk(KERN_INFO "comedi%d: dt282x: 0x%04lx", dev->minor, iobase); - if (!request_region(iobase, DT2821_SIZE, dev->board_name)) { - printk(KERN_INFO " I/O port conflict\n"); - return -EBUSY; - } - dev->iobase = iobase; + ret = comedi_request_region(dev, it->options[0], DT2821_SIZE); + if (ret) + return ret; outw(DT2821_BDINIT, dev->iobase + DT2821_SUPCSR); i = inw(dev->iobase + DT2821_ADCSR); |