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

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

staging: comedi: ni_atmio16d: 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 61f9eb9a

drivers/staging/comedi/drivers/ni_atmio16d.c

+4 −11
Original line number Diff line number Diff line
@@ -638,20 +638,13 @@ static int atmio16d_attach(struct comedi_device *dev, 
{

	const struct atmio16_board_t *board = comedi_board(dev);

	struct atmio16d_private *devpriv;

	struct comedi_subdevice *s;

	unsigned int irq;

	unsigned long iobase;

	int ret;



	struct comedi_subdevice *s;



	/* make sure the address range is free and allocate it */

	iobase = it->options[0];

	printk(KERN_INFO "comedi%d: atmio16d: 0x%04lx ", dev->minor, iobase);

	if (!request_region(iobase, ATMIO16D_SIZE, dev->board_name)) {

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

		return -EIO;

	}

	dev->iobase = iobase;

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

	if (ret)

		return ret;



	ret = comedi_alloc_subdevices(dev, 4);

	if (ret)