]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: rtd520: remove the board attach noise
authorH Hartley Sweeten <hartleys@visionengravers.com>
Mon, 29 Oct 2012 17:03:30 +0000 (10:03 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 30 Oct 2012 17:44:38 +0000 (10:44 -0700)
Remove all the kernel noise that is output as the board is
attached. Leave a simple dev_info() after the attach is complete.

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/rtd520.c

index 3fc4d6878d1d170d7c857f88a0c5f62d9cfdbb01..f1cd266c6f4471a4b945cdc9eef8850a397d5960 100644 (file)
@@ -1431,8 +1431,6 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        struct comedi_subdevice *s;
        int ret;
 
-       dev_info(dev->class_dev, "rtd520 attaching.\n");
-
        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
        if (!devpriv)
                return -ENOMEM;
@@ -1447,11 +1445,8 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        dev->board_name = thisboard->name;
 
        ret = comedi_pci_enable(pcidev, DRV_NAME);
-       if (ret < 0) {
-               dev_info(dev->class_dev,
-                        "Failed to enable PCI device and request regions.\n");
+       if (ret)
                return ret;
-       }
        dev->iobase = 1;        /* the "detach" needs this */
 
        devpriv->las0 = ioremap_nocache(pci_resource_start(pcidev, 2),
@@ -1465,9 +1460,6 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
        rtd_pci_latency_quirk(dev, pcidev);
 
-       /* Show board configuration */
-       dev_info(dev->class_dev, "%s:", dev->board_name);
-
        ret = comedi_alloc_subdevices(dev, 4);
        if (ret)
                return ret;
@@ -1525,28 +1517,21 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        /* check if our interrupt is available and get it */
        ret = request_irq(pcidev->irq, rtd_interrupt,
                          IRQF_SHARED, DRV_NAME, dev);
-
-       if (ret < 0) {
-               printk("Could not get interrupt! (%u)\n",
-                      pcidev->irq);
+       if (ret < 0)
                return ret;
-       }
        dev->irq = pcidev->irq;
-       dev_info(dev->class_dev, "( irq=%u )", dev->irq);
 
        ret = rtd520_probe_fifo_depth(dev);
        if (ret < 0)
                return ret;
-
        devpriv->fifoLen = ret;
-       printk("( fifoLen=%d )", devpriv->fifoLen);
 
        if (dev->irq)
                writel(ICS_PIE | ICS_PLIE, devpriv->lcfg + LCFG_ITCSR);
 
-       printk("\ncomedi%d: rtd520 driver attached.\n", dev->minor);
+       dev_info(dev->class_dev, "%s attached\n", dev->board_name);
 
-       return 1;
+       return 0;
 }
 
 static void rtd_detach(struct comedi_device *dev)