From cd15124a2ce1f87c82ef125f56cf3dd003e5d017 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 7 Sep 2012 17:42:12 -0700
Subject: [PATCH] --- yaml --- r: 324952 b: refs/heads/master c:
 9c943f4ed479d58a2814239815e45fc0b61f4116 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/me4000.c | 32 +++----------------
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index 5f9346fe5a73..6dc7dd1e0f58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0818dc0a35571c294540cc8531f071e01f915205
+refs/heads/master: 9c943f4ed479d58a2814239815e45fc0b61f4116
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c
index eeca9711dde1..71ca75f4a92a 100644
--- a/trunk/drivers/staging/comedi/drivers/me4000.c
+++ b/trunk/drivers/staging/comedi/drivers/me4000.c
@@ -383,45 +383,21 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
 
 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;
 }