staging: comedi: s526: use comedi_request_region()

Use comedi_request_region() to request the I/O region used by this
driver.

Remove the board attach noise 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/s526.c b/drivers/staging/comedi/drivers/s526.c
index b490b47b0bb847b85929971d496819b902e077cb..0fd4ba1939bdcdaa34c66181c2dc719f5e004957 100644 (file)
--- a/drivers/staging/comedi/drivers/s526.c
+++ b/drivers/staging/comedi/drivers/s526.c
@@ -552,15 +552,11 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
        struct s526_private *devpriv;
        struct comedi_subdevice *s;
-       int iobase;
        int ret;
 
-       iobase = it->options[0];
-       if (!iobase || !request_region(iobase, S526_IOSIZE, dev->board_name)) {
-               comedi_error(dev, "I/O port conflict");
-               return -EIO;
-       }
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], S526_IOSIZE);
+       if (ret)
+               return ret;
 
        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
        if (!devpriv)
@@ -614,8 +610,6 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        s->insn_bits = s526_dio_insn_bits;
        s->insn_config = s526_dio_insn_config;
 
-       dev_info(dev->class_dev, "%s attached\n", dev->board_name);
-
        return 1;
 }