staging: comedi: rti802: use comedi_request_region()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 23:14:33 +0000 (16:14 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Apr 2013 19:47:38 +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/rti802.c

index 1440162c841149a3d5402824783ea7a6d188aafd..8569712dd4b40ed7739c75c0bf70c793faa3a93a 100644 (file)
@@ -92,16 +92,11 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        struct rti802_private *devpriv;
        struct comedi_subdevice *s;
        int i;
-       unsigned long iobase;
        int ret;
 
-       iobase = it->options[0];
-       printk(KERN_INFO "comedi%d: rti802: 0x%04lx ", dev->minor, iobase);
-       if (!request_region(iobase, RTI802_SIZE, "rti802")) {
-               printk(KERN_WARNING "I/O port conflict\n");
-               return -EIO;
-       }
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], RTI802_SIZE);
+       if (ret)
+               return ret;
 
        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
        if (!devpriv)