staging: comedi: ni_6527: remove extra probe noise
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 1 Oct 2013 22:09:16 +0000 (15:09 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Oct 2013 21:09:52 +0000 (14:09 -0700)
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@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ni_6527.c

index f99825dcda052803e725a939c2faf08399668033..4608d61aa44e3086d25585b39823726b81fa37a4 100644 (file)
@@ -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)