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 <[email protected]> Cc: Ian Abbott <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> --- drivers/staging/comedi/drivers/fl512.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c index 07f9d67..bf1c12b 100644 --- a/drivers/staging/comedi/drivers/fl512.c +++ b/drivers/staging/comedi/drivers/fl512.c @@ -111,30 +111,18 @@ static int fl512_ao_insn_readback(struct comedi_device *dev, static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it) { struct fl512_private *devpriv; - unsigned long iobase; - int ret; - - /* pointer to the subdevice: Analog in, Analog out, - (not made ->and Digital IO) */ struct comedi_subdevice *s; + int ret; - iobase = it->options[0]; - printk(KERN_INFO "comedi:%d fl512: 0x%04lx", dev->minor, iobase); - if (!request_region(iobase, FL512_SIZE, "fl512")) { - printk(KERN_WARNING " I/O port conflict\n"); - return -EIO; - } - dev->iobase = iobase; + ret = comedi_request_region(dev, it->options[0], FL512_SIZE); + if (ret) + return ret; devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); if (!devpriv) return -ENOMEM; dev->private = devpriv; -#if DEBUG - printk(KERN_DEBUG "malloc ok\n"); -#endif - ret = comedi_alloc_subdevices(dev, 2); if (ret) return ret; @@ -156,7 +144,6 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->range_table = &range_fl512; /* function to call when read AD */ s->insn_read = fl512_ai_insn; - printk(KERN_INFO "comedi: fl512: subdevice 0 initialized\n"); /* Analog output */ s = &dev->subdevices[1]; @@ -174,7 +161,6 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_write = fl512_ao_insn; /* function to call when reading DA */ s->insn_read = fl512_ao_insn_readback; - printk(KERN_INFO "comedi: fl512: subdevice 1 initialized\n"); return 1; } -- 1.8.1.4 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
