]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
staging: comedi: ni_labpc: remove board attach noise
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Fri, 22 Mar 2013 16:56:25 +0000 (09:56 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Mar 2013 18:43:01 +0000 (11:43 -0700)
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>
drivers/staging/comedi/drivers/ni_labpc.c

index 926c4f12d04c9d24ee6708c97ed258750a7f1867..244b3e51ee3ba28a542b351ead6905cc72a1b9b5 100644 (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);