staging: comedi: ampcl_pc263: 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/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c
index b8449433eee755111d5f4af93aabecaadc702537..1b1c1aac3109a2f8798f9004c9f8ecfd56fc0b13 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pc263.c
+++ b/drivers/staging/comedi/drivers/amplc_pc263.c
@@ -166,20 +166,6 @@ static struct pci_dev *pc263_find_pci_dev(struct comedi_device *dev,
                bus, slot);
        return NULL;
 }
-/*
- * This function checks and requests an I/O region, reporting an error
- * if there is a conflict.
- */
-static int pc263_request_region(struct comedi_device *dev, unsigned long from,
-                               unsigned long extent)
-{
-       if (!from || !request_region(from, extent, PC263_DRIVER_NAME)) {
-               dev_err(dev->class_dev, "I/O port conflict (%#lx,%lu)!\n",
-                       from, extent);
-               return -EIO;
-       }
-       return 0;
-}
 
 static int pc263_do_insn_bits(struct comedi_device *dev,
                              struct comedi_subdevice *s,
@@ -268,15 +254,12 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        const struct pc263_board *thisboard = comedi_board(dev);
        int ret;
 
-       dev_info(dev->class_dev, PC263_DRIVER_NAME ": attach\n");
-
        /* Process options and reserve resources according to bus type. */
        if (is_isa_board(thisboard)) {
-               unsigned long iobase = it->options[0];
-               ret = pc263_request_region(dev, iobase, PC263_IO_SIZE);
-               if (ret < 0)
+               ret = comedi_request_region(dev, it->options[0], PC263_IO_SIZE);
+               if (ret)
                        return ret;
-               return pc263_common_attach(dev, iobase);
+               return pc263_common_attach(dev, dev->iobase);
        } else if (is_pci_board(thisboard)) {
                struct pci_dev *pci_dev;