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/pcm3724.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/staging/comedi/drivers/pcm3724.c b/drivers/staging/comedi/drivers/pcm3724.c index d78aeeb..7f9266c 100644 --- a/drivers/staging/comedi/drivers/pcm3724.c +++ b/drivers/staging/comedi/drivers/pcm3724.c @@ -226,27 +226,16 @@ static int pcm3724_attach(struct comedi_device *dev, { struct priv_pcm3724 *priv; struct comedi_subdevice *s; - unsigned long iobase; - unsigned int iorange; int ret, i; - iobase = it->options[0]; - iorange = PCM3724_SIZE; - priv = kzalloc(sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; dev->private = priv; - printk(KERN_INFO "comedi%d: pcm3724: board=%s, 0x%03lx ", dev->minor, - dev->board_name, iobase); - if (!iobase || !request_region(iobase, iorange, "pcm3724")) { - printk("I/O port conflict\n"); - return -EIO; - } - - dev->iobase = iobase; - printk(KERN_INFO "\n"); + ret = comedi_request_region(dev, it->options[0], PCM3724_SIZE); + if (ret) + return ret; ret = comedi_alloc_subdevices(dev, 2); if (ret) -- 1.8.1.4 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
