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

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

staging: comedi: das6402: use comedi_request_region() 



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

Remove the default iobase address (0x300) that is used when the user
does not pass a base address during the "comedi_config". Comedi
legacy drivers should only attach to a specified address.

Remove the dev_err() 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 29a879b1

drivers/staging/comedi/drivers/das6402.c

+3 −12
Original line number Diff line number Diff line
@@ -284,21 +284,12 @@ static int das6402_attach(struct comedi_device *dev, 
{

	struct das6402_private *devpriv;

	unsigned int irq;

	unsigned long iobase;

	int ret;

	struct comedi_subdevice *s;



	iobase = it->options[0];

	if (iobase == 0)

		iobase = 0x300;



	if (!request_region(iobase, DAS6402_SIZE, "das6402")) {

		dev_err(dev->class_dev, "I/O port conflict\n");

		return -EIO;

	}

	dev->iobase = iobase;



	/* should do a probe here */

	ret = comedi_request_region(dev, it->options[0], DAS6402_SIZE);

	if (ret)

		return ret;



	irq = it->options[0];

	dev_dbg(dev->class_dev, "( irq = %u )\n", irq);