]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: comedi: dt2815: use comedi_request_region()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 23:19:04 +0000 (16:19 -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/dt2815.c

index ad18b1ac8d321adbc3289fb2c38098f2f099fa3a..c0eb2e2267153e58c9d79e310ed702bc3ce1eee1 100644 (file)
@@ -160,17 +160,11 @@ static int dt2815_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        struct comedi_subdevice *s;
        int i;
        const struct comedi_lrange *current_range_type, *voltage_range_type;
-       unsigned long iobase;
        int ret;
 
-       iobase = it->options[0];
-       printk(KERN_INFO "comedi%d: dt2815: 0x%04lx ", dev->minor, iobase);
-       if (!request_region(iobase, DT2815_SIZE, "dt2815")) {
-               printk(KERN_WARNING "I/O port conflict\n");
-               return -EIO;
-       }
-
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], DT2815_SIZE);
+       if (ret)
+               return ret;
 
        ret = comedi_alloc_subdevices(dev, 1);
        if (ret)