diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-09 16:29:13 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-11 12:47:53 -0700 |
| commit | 70998b990b0489dcebd2e5b75a0e0cc3fff1065e (patch) | |
| tree | d63bbdea39f2c44400baa00c07eeaa8b8149b477 /drivers/staging/comedi/drivers/multiq3.c | |
| parent | 4aa83c198082f4e703b8a424d1065f76d7885cdf (diff) | |
staging: comedi: multiq3: 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>
Diffstat (limited to 'drivers/staging/comedi/drivers/multiq3.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/multiq3.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/staging/comedi/drivers/multiq3.c b/drivers/staging/comedi/drivers/multiq3.c index 475020652e4e..b6bc2dabbcc7 100644 --- a/drivers/staging/comedi/drivers/multiq3.c +++ b/drivers/staging/comedi/drivers/multiq3.c @@ -226,22 +226,16 @@ static int multiq3_attach(struct comedi_device *dev, struct comedi_devconfig *it) { struct multiq3_private *devpriv; - int result = 0; - unsigned long iobase; struct comedi_subdevice *s; + int ret; - iobase = it->options[0]; - printk(KERN_INFO "comedi%d: multiq3: 0x%04lx ", dev->minor, iobase); - if (!request_region(iobase, MULTIQ3_SIZE, "multiq3")) { - printk(KERN_ERR "comedi%d: I/O port conflict\n", dev->minor); - return -EIO; - } - - dev->iobase = iobase; + ret = comedi_request_region(dev, it->options[0], MULTIQ3_SIZE); + if (ret) + return ret; - result = comedi_alloc_subdevices(dev, 5); - if (result) - return result; + ret = comedi_alloc_subdevices(dev, 5); + if (ret) + return ret; devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); if (!devpriv) |