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

Also, remove the unnecessary 'dev->irq = 0'. This driver does not
use interrupts and the comedi core has already cleared this variable.

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/pcm3730.c

index d049194f366ab8d81e614a172cb12acccd5d7313..f82a356a938b5fb6ed05b3858a91870e1c3633f1 100644 (file)
@@ -54,18 +54,11 @@ static int pcm3730_attach(struct comedi_device *dev,
                          struct comedi_devconfig *it)
 {
        struct comedi_subdevice *s;
-       unsigned long iobase;
        int ret;
 
-       iobase = it->options[0];
-       printk(KERN_INFO "comedi%d: pcm3730: 0x%04lx ", dev->minor, iobase);
-       if (!request_region(iobase, PCM3730_SIZE, "pcm3730")) {
-               printk("I/O port conflict\n");
-               return -EIO;
-       }
-       dev->iobase = iobase;
-       dev->iobase = dev->iobase;
-       dev->irq = 0;
+       ret = comedi_request_region(dev, it->options[0], PCM3730_SIZE);
+       if (ret)
+               return ret;
 
        ret = comedi_alloc_subdevices(dev, 6);
        if (ret)