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 <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/comedi/drivers/ni_atmio.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_atmio.c 
b/drivers/staging/comedi/drivers/ni_atmio.c
index 37372a1..02e5ae1 100644
--- a/drivers/staging/comedi/drivers/ni_atmio.c
+++ b/drivers/staging/comedi/drivers/ni_atmio.c
@@ -437,15 +437,9 @@ static int ni_atmio_attach(struct comedi_device *dev,
                devpriv->isapnp_dev = isapnp_dev;
        }
 
-       /* reserve our I/O region */
-
-       printk("comedi%d: ni_atmio: 0x%04lx", dev->minor, iobase);
-       if (!request_region(iobase, NI_SIZE, "ni_atmio")) {
-               printk(" I/O port conflict\n");
-               return -EIO;
-       }
-
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, iobase, NI_SIZE);
+       if (ret)
+               return ret;
 
 #ifdef DEBUG
        /* board existence sanity check */
-- 
1.8.1.4

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to