staging: comedi: pcmad: use comedi_request_region()

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>

diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c
index 130e9291400e6775310293b965f99c478cf97b82..01e81c8fa853eba83101e36553e581c445f20043 100644 (file)
--- a/drivers/staging/comedi/drivers/pcmad.c
+++ b/drivers/staging/comedi/drivers/pcmad.c
@@ -105,18 +105,12 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
        const struct pcmad_board_struct *board = comedi_board(dev);
        struct pcmad_priv_struct *devpriv;
-       int ret;
        struct comedi_subdevice *s;
-       unsigned long iobase;
+       int ret;
 
-       iobase = it->options[0];
-       printk(KERN_INFO "comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
-       if (!request_region(iobase, PCMAD_SIZE, dev->board_name)) {
-               printk(KERN_CONT "I/O port conflict\n");
-               return -EIO;
-       }
-       printk(KERN_CONT "\n");
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], PCMAD_SIZE);
+       if (ret)
+               return ret;
 
        ret = comedi_alloc_subdevices(dev, 1);
        if (ret)