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

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

staging: comedi: pcmda12: 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 3e9b1fca

drivers/staging/comedi/drivers/pcmda12.c

+3 −13
Original line number Diff line number Diff line
@@ -154,19 +154,11 @@ static int pcmda12_attach(struct comedi_device *dev, 
{

	struct pcmda12_private *devpriv;

	struct comedi_subdevice *s;

	unsigned long iobase;

	int ret;



	iobase = it->options[0];

	printk(KERN_INFO

	       "comedi%d: %s: io: %lx %s ", dev->minor, dev->driver->driver_name,

	       iobase, it->options[1] ? "simultaneous xfer mode enabled" : "");



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

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

		return -EIO;

	}

	dev->iobase = iobase;

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

	if (ret)

		return ret;



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

	if (!devpriv)
@@ -191,8 +183,6 @@ static int pcmda12_attach(struct comedi_device *dev, 


	zero_chans(dev);	/* clear out all the registers, basically */



	printk(KERN_INFO "attached\n");



	return 1;

}