[PATCH 04/22] staging: comedi: ni_6527: remove extra probe noise

H Hartley Sweeten hsweeten at visionengravers.com
Tue Oct 1 22:09:16 UTC 2013


The dev_info() showing the board id is just extra noise.

Remove it but make sure the probed id is correct. Rename the CamelCase
define used for the id register.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/ni_6527.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index f99825d..4608d61 100644
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -43,7 +43,7 @@ Updated: Sat, 25 Jan 2003 13:24:40 -0800
 #include "mite.h"
 
 #define Port_Register(x)			(0x00+(x))
-#define ID_Register				0x06
+#define NI6527_ID_REG			0x06
 
 #define Clear_Register				0x07
 #define ClrEdge				0x08
@@ -342,8 +342,9 @@ static int ni6527_auto_attach(struct comedi_device *dev,
 		return ret;
 	}
 
-	dev_info(dev->class_dev, "board: %s, ID=0x%02x\n", dev->board_name,
-		 readb(devpriv->mite->daq_io_addr + ID_Register));
+	/* make sure this is actually a 6527 device */
+	if (readb(devpriv->mite->daq_io_addr + NI6527_ID_REG) != 0x27)
+		return -ENODEV;
 
 	ret = comedi_alloc_subdevices(dev, 3);
 	if (ret)
-- 
1.8.3.2



More information about the devel mailing list