Commit 83d75eff authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: ni_labpc: remove board attach noise

Remove the kernel noise in labpc_common_attach() as well as a couple
obvious comments.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 29089908
......@@ -1629,19 +1629,12 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
dev->board_name = board->name;
dev_info(dev->class_dev, "ni_labpc: %s\n", dev->board_name);
if (iobase == 0) {
dev_err(dev->class_dev, "io base address is zero!\n");
if (iobase == 0)
return -EINVAL;
}
/* request io regions for isa boards */
if (board->bustype == isa_bustype) {
/* check if io addresses are available */
if (!request_region(iobase, LABPC_SIZE, dev->board_name)) {
dev_err(dev->class_dev, "I/O port conflict\n");
if (!request_region(iobase, LABPC_SIZE, dev->board_name))
return -EIO;
}
}
dev->iobase = iobase;
if (board->has_mmio) {
......@@ -1651,6 +1644,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
devpriv->read_byte = labpc_inb;
devpriv->write_byte = labpc_outb;
}
/* initialize board's command registers */
devpriv->write_byte(devpriv->cmd1, dev->iobase + CMD1_REG);
devpriv->write_byte(devpriv->cmd2, dev->iobase + CMD2_REG);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment