summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-09-08 00:42:12 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-08 04:49:56 (GMT)
commit9c943f4ed479d58a2814239815e45fc0b61f4116 (patch)
tree0f4a3e744652e788e25a8001767d2c48ae7428cf
parent0818dc0a35571c294540cc8531f071e01f915205 (diff)
downloadlinux-fsl-qoriq-9c943f4ed479d58a2814239815e45fc0b61f4116.tar.xz
staging: comedi: me4000: remove the pci resource error messages
Remove the error messages about the pci base address not being available. They are just noise. 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.c32
1 files changed, 4 insertions, 28 deletions
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index eeca971..71ca75f 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -383,45 +383,21 @@ found:
static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
{
- /*--------------------------- plx regbase -------------------------------*/
-
info->plx_regbase = pci_resource_start(pci_dev_p, 1);
- if (info->plx_regbase == 0) {
- printk(KERN_ERR
- "comedi%d: me4000: get_registers(): "
- "PCI base address 1 is not available\n", dev->minor);
+ if (!info->plx_regbase)
return -ENODEV;
- }
-
- /*--------------------------- me4000 regbase ----------------------------*/
info->me4000_regbase = pci_resource_start(pci_dev_p, 2);
- if (info->me4000_regbase == 0) {
- printk(KERN_ERR
- "comedi%d: me4000: get_registers(): "
- "PCI base address 2 is not available\n", dev->minor);
+ if (!info->me4000_regbase)
return -ENODEV;
- }
-
- /*--------------------------- timer regbase ------------------------------*/
info->timer_regbase = pci_resource_start(pci_dev_p, 3);
- if (info->timer_regbase == 0) {
- printk(KERN_ERR
- "comedi%d: me4000: get_registers(): "
- "PCI base address 3 is not available\n", dev->minor);
+ if (!info->timer_regbase)
return -ENODEV;
- }
-
- /*--------------------------- program regbase ----------------------------*/
info->program_regbase = pci_resource_start(pci_dev_p, 5);
- if (info->program_regbase == 0) {
- printk(KERN_ERR
- "comedi%d: me4000: get_registers(): "
- "PCI base address 5 is not available\n", dev->minor);
+ if (!info->program_regbase)
return -ENODEV;
- }
return 0;
}