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

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

staging: comedi: dmm32at: 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 364e3a87

drivers/staging/comedi/drivers/dmm32at.c

+3 −13
Original line number Diff line number Diff line
@@ -695,23 +695,13 @@ static int dmm32at_attach(struct comedi_device *dev, 
	int ret;

	struct comedi_subdevice *s;

	unsigned char aihi, ailo, fifostat, aistat, intstat, airback;

	unsigned long iobase;

	unsigned int irq;



	iobase = it->options[0];

	irq = it->options[1];



	printk(KERN_INFO "comedi%d: dmm32at: attaching\n", dev->minor);

	printk(KERN_DEBUG "dmm32at: probing at address 0x%04lx, irq %u\n",

	       iobase, irq);



	/* register address space */

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

		printk(KERN_ERR "comedi%d: dmm32at: I/O port conflict\n",

		       dev->minor);

		return -EIO;

	}

	dev->iobase = iobase;

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

	if (ret)

		return ret;



	/* the following just makes sure the board is there and gets

	   it to a known state */