]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
staging: comedi: pcl3724: use comedi_request_region()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 23:11:57 +0000 (16:11 -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.

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

index d78aeebd17b5b5e43df4c1316b5c0066350ffe7a..7f9266cefc169aaaee10916e0fdbb2cba01079f6 100644 (file)
@@ -226,27 +226,16 @@ static int pcm3724_attach(struct comedi_device *dev,
 {
        struct priv_pcm3724 *priv;
        struct comedi_subdevice *s;
-       unsigned long iobase;
-       unsigned int iorange;
        int ret, i;
 
-       iobase = it->options[0];
-       iorange = PCM3724_SIZE;
-
        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
        dev->private = priv;
 
-       printk(KERN_INFO "comedi%d: pcm3724: board=%s, 0x%03lx ", dev->minor,
-              dev->board_name, iobase);
-       if (!iobase || !request_region(iobase, iorange, "pcm3724")) {
-               printk("I/O port conflict\n");
-               return -EIO;
-       }
-
-       dev->iobase = iobase;
-       printk(KERN_INFO "\n");
+       ret = comedi_request_region(dev, it->options[0], PCM3724_SIZE);
+       if (ret)
+               return ret;
 
        ret = comedi_alloc_subdevices(dev, 2);
        if (ret)