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

index e4d629e6d06ec6e3e09d23eadc9499ef538ff8a9..46dca8e8a8a1f085ba241455cbeeffca99638dc7 100644 (file)
@@ -246,15 +246,10 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        int i, irq;
        int ret;
        struct comedi_subdevice *s;
-       unsigned long iobase;
 
-       iobase = it->options[0];
-       printk(KERN_INFO "comedi%d: dt2814: 0x%04lx ", dev->minor, iobase);
-       if (!request_region(iobase, DT2814_SIZE, "dt2814")) {
-               printk(KERN_ERR "I/O port conflict\n");
-               return -EIO;
-       }
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], DT2814_SIZE);
+       if (ret)
+               return ret;
 
        outb(0, dev->iobase + DT2814_CSR);
        udelay(100);