UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-03-22 09:56:25 -07:00 committed by Greg Kroah-Hartman
parent 290899082a
commit 83d75effa7
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/comedi/drivers/ni_labpc.c
View File

@ -1629,18 +1629,11 @@ 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;
@ -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);