diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-10-29 10:03:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-30 10:44:38 -0700 |
| commit | edecbd062816e69d7143c58346744ab7585bbb3d (patch) | |
| tree | 37b224b1bc7b63e51b32e0c99e4efa69228b105c | |
| parent | 60aeb08024dcd8a392917ab72a107ad451a59030 (diff) | |
staging: comedi: rtd520: remove the board attach noise
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/rtd520.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index 3fc4d6878d1d..f1cd266c6f44 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c @@ -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) |