From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Fri, 22 Mar 2013 16:56:25 +0000 (-0700)
Subject: staging: comedi: ni_labpc: remove board attach noise
X-Git-Tag: v3.10-rc1~192^2~442
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=83d75effa74dc26f5c989f7a4385c345dff1e58f;p=linux.git

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>
---

diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index 926c4f12d04c..244b3e51ee3b 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -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);