]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
staging: comedi: dt2811: use comedi_request_region()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 23:18:23 +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/dt2811.c

index be9aaa7e42c65fe913630aac16a1645204cfb20d..16cbd540ab31ee65d5381189d6a17fba2d3a87f1 100644 (file)
@@ -399,18 +399,10 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        struct dt2811_private *devpriv;
        int ret;
        struct comedi_subdevice *s;
-       unsigned long iobase;
 
-       iobase = it->options[0];
-
-       printk(KERN_INFO "comedi%d: dt2811:base=0x%04lx\n", dev->minor, iobase);
-
-       if (!request_region(iobase, DT2811_SIZE, dev->board_name)) {
-               printk(KERN_ERR "I/O port conflict\n");
-               return -EIO;
-       }
-
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], DT2811_SIZE);
+       if (ret)
+               return ret;
 
 #if 0
        outb(0, dev->iobase + DT2811_ADCSR);