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

staging: comedi: ni_at_ao: use comedi_request_region() 



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

Remove the board attach noise 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 ce1edddd

drivers/staging/comedi/drivers/ni_at_ao.c

+3 −11
Original line number Diff line number Diff line
@@ -337,22 +337,14 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	const struct atao_board *board = comedi_board(dev);

	struct atao_private *devpriv;

	struct comedi_subdevice *s;

	unsigned long iobase;

	int ao_unipolar;

	int ret;



	iobase = it->options[0];

	if (iobase == 0)

		iobase = 0x1c0;

	ao_unipolar = it->options[3];



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



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

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

		return -EIO;

	}

	dev->iobase = iobase;

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

	if (ret)

		return ret;



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

	if (!devpriv)