mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-01 16:57:18 +09:00
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: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
3e9b1fcaf9
commit
7b65009039
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user