staging: comedi: multiq3: use comedi_request_region()

[firefly-linux-kernel-4.4.55.git] / drivers / staging / comedi / drivers / multiq3.c

diff --git a/drivers/staging/comedi/drivers/multiq3.c b/drivers/staging/comedi/drivers/multiq3.c
index 475020652e4e814a99407073f6d782014e5bad74..b6bc2dabbcc77e826e9178ae7715ed457fcc535b 100644 (file)
--- a/drivers/staging/comedi/drivers/multiq3.c
+++ b/drivers/staging/comedi/drivers/multiq3.c
@@ -226,22 +226,16 @@ static int multiq3_attach(struct comedi_device *dev,
                          struct comedi_devconfig *it)
 {
        struct multiq3_private *devpriv;
-       int result = 0;
-       unsigned long iobase;
        struct comedi_subdevice *s;
+       int ret;
 
-       iobase = it->options[0];
-       printk(KERN_INFO "comedi%d: multiq3: 0x%04lx ", dev->minor, iobase);
-       if (!request_region(iobase, MULTIQ3_SIZE, "multiq3")) {
-               printk(KERN_ERR "comedi%d: I/O port conflict\n", dev->minor);
-               return -EIO;
-       }
-
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], MULTIQ3_SIZE);
+       if (ret)
+               return ret;
 
-       result = comedi_alloc_subdevices(dev, 5);
-       if (result)
-               return result;
+       ret = comedi_alloc_subdevices(dev, 5);
+       if (ret)
+               return ret;
 
        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
        if (!devpriv)