staging: comedi: pcl724: 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>

diff --git a/drivers/staging/comedi/drivers/pcl724.c b/drivers/staging/comedi/drivers/pcl724.c
index a8112e3af98fdd54c9421078b57c6eafdf777fca..2821ead2772c42f058d0455c4074ccee1c8bed8a 100644 (file)
--- a/drivers/staging/comedi/drivers/pcl724.c
+++ b/drivers/staging/comedi/drivers/pcl724.c
@@ -100,26 +100,19 @@ static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
        const struct pcl724_board *board = comedi_board(dev);
        struct comedi_subdevice *s;
-       unsigned long iobase;
        unsigned int iorange;
        int ret, i, n_subdevices;
 #ifdef PCL724_IRQ
        unsigned int irq;
 #endif
 
-       iobase = it->options[0];
        iorange = board->io_range;
-       if ((board->can_have96) && ((it->options[1] == 1)
-                                        || (it->options[1] == 96)))
+       if ((board->can_have96) &&
+           ((it->options[1] == 1) || (it->options[1] == 96)))
                iorange = PCL722_96_SIZE; /* PCL-724 in 96 DIO configuration */
-       printk(KERN_INFO "comedi%d: pcl724: board=%s, 0x%03lx ", dev->minor,
-              board->name, iobase);
-       if (!request_region(iobase, iorange, dev->board_name)) {
-               printk("I/O port conflict\n");
-               return -EIO;
-       }
-
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], iorange);
+       if (ret)
+               return ret;
 
 #ifdef PCL724_IRQ
        irq = 0;