]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: pcl816: use comedi_request_region()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 23:10:53 +0000 (16:10 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Apr 2013 19:47:37 +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/pcl816.c

index eb0816e75d61372a056c3fc9cbf3b0a54e8a657c..6266b2b025971725b8c5e359a1d9a5e45946e104 100644 (file)
@@ -981,25 +981,16 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        const struct pcl816_board *board = comedi_board(dev);
        struct pcl816_private *devpriv;
        int ret;
-       unsigned long iobase;
        unsigned int irq, dma;
        unsigned long pages;
        /* int i; */
        struct comedi_subdevice *s;
 
-       /* claim our I/O space */
-       iobase = it->options[0];
-       printk("comedi%d: pcl816:  board=%s, ioport=0x%03lx", dev->minor,
-              board->name, iobase);
-
-       if (!request_region(iobase, board->io_range, dev->board_name)) {
-               printk("I/O port conflict\n");
-               return -EIO;
-       }
-
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], board->io_range);
+       if (ret)
+               return ret;
 
-       if (pcl816_check(iobase)) {
+       if (pcl816_check(dev->iobase)) {
                printk(KERN_ERR ", I cann't detect board. FAIL!\n");
                return -EIO;
        }