Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02edcb2a authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: c6xdigio: 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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce573add

drivers/staging/comedi/drivers/c6xdigio.c

+7 −12
Original line number Diff line number Diff line
@@ -413,21 +413,16 @@ static struct pnp_driver c6xdigio_pnp_driver = { 
static int c6xdigio_attach(struct comedi_device *dev,

			   struct comedi_devconfig *it)

{

	int result = 0;

	unsigned long iobase;

	struct comedi_subdevice *s;

	int ret;



	iobase = it->options[0];

	printk(KERN_DEBUG "comedi%d: c6xdigio: 0x%04lx\n", dev->minor, iobase);

	if (!request_region(iobase, C6XDIGIO_SIZE, "c6xdigio")) {

		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], C6XDIGIO_SIZE);

	if (ret)

		return ret;



	result = comedi_alloc_subdevices(dev, 2);

	if (result)

		return result;

	ret = comedi_alloc_subdevices(dev, 2);

	if (ret)

		return ret;



	/*  Make sure that PnP ports get activated */

	pnp_register_driver(&c6xdigio_pnp_driver);