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

index ca07e54de2eef06eca7b99b28af71515ad19f4c6..7621cdf27b3af3ca499f43713b41ff86ee7eef7f 100644 (file)
@@ -695,23 +695,13 @@ static int dmm32at_attach(struct comedi_device *dev,
        int ret;
        struct comedi_subdevice *s;
        unsigned char aihi, ailo, fifostat, aistat, intstat, airback;
-       unsigned long iobase;
        unsigned int irq;
 
-       iobase = it->options[0];
        irq = it->options[1];
 
-       printk(KERN_INFO "comedi%d: dmm32at: attaching\n", dev->minor);
-       printk(KERN_DEBUG "dmm32at: probing at address 0x%04lx, irq %u\n",
-              iobase, irq);
-
-       /* register address space */
-       if (!request_region(iobase, DMM32AT_MEMSIZE, dev->board_name)) {
-               printk(KERN_ERR "comedi%d: dmm32at: I/O port conflict\n",
-                      dev->minor);
-               return -EIO;
-       }
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], DMM32AT_MEMSIZE);
+       if (ret)
+               return ret;
 
        /* the following just makes sure the board is there and gets
           it to a known state */