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

index 9b044644d6c4faa8e68763d7c54de7555df59c91..86b29c5847fe47df99b393f63c304bdc4024d581 100644 (file)
@@ -1122,22 +1122,15 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        const struct pcl812_board *board = comedi_board(dev);
        struct pcl812_private *devpriv;
        int ret, subdev;
-       unsigned long iobase;
        unsigned int irq;
        unsigned int dma;
        unsigned long pages;
        struct comedi_subdevice *s;
        int n_subdevices;
 
-       iobase = it->options[0];
-       printk(KERN_INFO "comedi%d: pcl812:  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;
 
        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
        if (!devpriv) {