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

index 64b76e48c29069d2508940b16cd7a5ac6e30728f..1e337b717a72f11408f781e89453ed0ba1e85ae3 100644 (file)
@@ -154,19 +154,11 @@ static int pcmda12_attach(struct comedi_device *dev,
 {
        struct pcmda12_private *devpriv;
        struct comedi_subdevice *s;
-       unsigned long iobase;
        int ret;
 
-       iobase = it->options[0];
-       printk(KERN_INFO
-              "comedi%d: %s: io: %lx %s ", dev->minor, dev->driver->driver_name,
-              iobase, it->options[1] ? "simultaneous xfer mode enabled" : "");
-
-       if (!request_region(iobase, IOSIZE, dev->driver->driver_name)) {
-               printk("I/O port conflict\n");
-               return -EIO;
-       }
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], IOSIZE);
+       if (ret)
+               return ret;
 
        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
        if (!devpriv)
@@ -191,8 +183,6 @@ static int pcmda12_attach(struct comedi_device *dev,
 
        zero_chans(dev);        /* clear out all the registers, basically */
 
-       printk(KERN_INFO "attached\n");
-
        return 1;
 }