diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-07 17:42:48 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-07 21:49:57 -0700 |
| commit | 2cb847b2a9d62ef1a1d5652ae17ff0b263377469 (patch) | |
| tree | 3d7e5c40f8b124d4d2b7d3b69cbb93365ffd5048 | |
| parent | d5cd01fee1c6ccd363eb6b0d40143173ffa23ef5 (diff) | |
staging: comedi: me4000: remove the noise when probing the card
The me4000_probe() function has a bunch of error messages that
are displayed when various parts of the probe fail. These are
just added noise. Remove them.
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/me4000.c | 62 |
1 files changed, 7 insertions, 55 deletions
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index f7ef0cb5dcd0..1801934bf15b 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/drivers/staging/comedi/drivers/me4000.c @@ -288,32 +288,14 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it) } } } - - printk(KERN_ERR - "comedi%d: me4000: me4000_probe(): " - "No supported board found (req. bus/slot : %d/%d)\n", - dev->minor, it->options[0], it->options[1]); return -ENODEV; found: - - printk(KERN_INFO - "comedi%d: me4000: me4000_probe(): " - "Found %s at PCI bus %d, slot %d\n", - dev->minor, me4000_boards[i].name, pci_device->bus->number, - PCI_SLOT(pci_device->devfn)); - - /* Set data in device structure */ dev->board_name = board->name; - /* Enable PCI device and request regions */ result = comedi_pci_enable(pci_device, dev->board_name); - if (result) { - printk(KERN_ERR - "comedi%d: me4000: me4000_probe(): Cannot enable PCI " - "device and request I/O regions\n", dev->minor); + if (result) return result; - } info->plx_regbase = pci_resource_start(pci_device, 1); if (!info->plx_regbase) @@ -331,59 +313,29 @@ found: if (!info->program_regbase) return -ENODEV; - /* Initialize board info */ result = init_board_info(dev, pci_device); - if (result) { - printk(KERN_ERR - "comedi%d: me4000: me4000_probe(): " - "Cannot init baord info\n", dev->minor); + if (result) return result; - } - /* Init analog output context */ result = init_ao_context(dev); - if (result) { - printk(KERN_ERR - "comedi%d: me4000: me4000_probe(): " - "Cannot init ao context\n", dev->minor); + if (result) return result; - } - /* Init analog input context */ result = init_ai_context(dev); - if (result) { - printk(KERN_ERR - "comedi%d: me4000: me4000_probe(): " - "Cannot init ai context\n", dev->minor); + if (result) return result; - } - /* Init digital I/O context */ result = init_dio_context(dev); - if (result) { - printk(KERN_ERR - "comedi%d: me4000: me4000_probe(): " - "Cannot init dio context\n", dev->minor); + if (result) return result; - } - /* Download the xilinx firmware */ result = xilinx_download(dev); - if (result) { - printk(KERN_ERR - "comedi%d: me4000: me4000_probe(): " - "Can't download firmware\n", dev->minor); + if (result) return result; - } - /* Make a hardware reset */ result = reset_board(dev); - if (result) { - printk(KERN_ERR - "comedi%d: me4000: me4000_probe(): Can't reset board\n", - dev->minor); + if (result) return result; - } return 0; } |