]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
staging: comedi: pcl711: use comedi_request_region()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 23:06:58 +0000 (16:06 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Apr 2013 19:47:35 +0000 (12:47 -0700)
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>
drivers/staging/comedi/drivers/pcl711.c

index 1a40a5e23aa035798fd82df9fd16e1c068865e4d..4610aa8e0f28543b443e69c125900176ed93ed31 100644 (file)
@@ -451,19 +451,12 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        const struct pcl711_board *board = comedi_board(dev);
        struct pcl711_private *devpriv;
        int ret;
-       unsigned long iobase;
        unsigned int irq;
        struct comedi_subdevice *s;
 
-       /* claim our I/O space */
-
-       iobase = it->options[0];
-       printk(KERN_INFO "comedi%d: pcl711: 0x%04lx ", dev->minor, iobase);
-       if (!request_region(iobase, PCL711_SIZE, dev->board_name)) {
-               printk("I/O port conflict\n");
-               return -EIO;
-       }
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], PCL711_SIZE);
+       if (ret)
+               return ret;
 
        /* grab our IRQ */
        irq = it->options[1];