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

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

staging: comedi: ni_at_a2150: 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 f19df8b0

drivers/staging/comedi/drivers/ni_at_a2150.c

+3 −26
Original line number Diff line number Diff line
@@ -719,43 +719,20 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	const struct a2150_board *thisboard = comedi_board(dev);

	struct a2150_private *devpriv;

	struct comedi_subdevice *s;

	unsigned long iobase = it->options[0];

	unsigned int irq = it->options[1];

	unsigned int dma = it->options[2];

	static const int timeout = 2000;

	int i;

	int ret;



	printk("comedi%d: %s: io 0x%lx", dev->minor, dev->driver->driver_name,

	       iobase);

	if (irq) {

		printk(", irq %u", irq);

	} else {

		printk(", no irq");

	}

	if (dma) {

		printk(", dma %u", dma);

	} else {

		printk(", no dma");

	}

	printk("\n");



	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);

	if (!devpriv)

		return -ENOMEM;

	dev->private = devpriv;



	if (iobase == 0) {

		printk(" io base address required\n");

		return -EINVAL;

	}



	/* check if io addresses are available */

	if (!request_region(iobase, A2150_SIZE, dev->driver->driver_name)) {

		printk(" I/O port conflict\n");

		return -EIO;

	}

	dev->iobase = iobase;

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

	if (ret)

		return ret;



	/* grab our IRQ */

	if (irq) {