---

yaml --- r: 324951 b: refs/heads/master c: 0818dc0 h: refs/heads/master i: 324949: dac8ea1 324947: 51414ad 324943: 8e37dc4 v: v3
git-mirror · Sep 8, 2012 · ca46203 · ca46203
1 parent eebf681
commit ca46203
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba98ab03f762696180227e015a13f1bac0a11f60
+refs/heads/master: 0818dc0a35571c294540cc8531f071e01f915205
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c
@@ -392,7 +392,6 @@ static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
 		       "PCI base address 1 is not available\n", dev->minor);
 		return -ENODEV;
 	}
-	info->plx_regbase_size = pci_resource_len(pci_dev_p, 1);
 
     /*--------------------------- me4000 regbase ----------------------------*/
 
@@ -403,7 +402,6 @@ static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
 		       "PCI base address 2 is not available\n", dev->minor);
 		return -ENODEV;
 	}
-	info->me4000_regbase_size = pci_resource_len(pci_dev_p, 2);
 
     /*--------------------------- timer regbase ------------------------------*/
 
@@ -414,7 +412,6 @@ static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
 		       "PCI base address 3 is not available\n", dev->minor);
 		return -ENODEV;
 	}
-	info->timer_regbase_size = pci_resource_len(pci_dev_p, 3);
 
     /*--------------------------- program regbase ----------------------------*/
 
@@ -425,7 +422,6 @@ static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
 		       "PCI base address 5 is not available\n", dev->minor);
 		return -ENODEV;
 	}
-	info->program_regbase_size = pci_resource_len(pci_dev_p, 5);
 
 	return 0;
 }

diff --git a/trunk/drivers/staging/comedi/drivers/me4000.h b/trunk/drivers/staging/comedi/drivers/me4000.h
@@ -280,11 +280,6 @@ struct me4000_info {
 	unsigned long timer_regbase;	/*  Base address of the timer circuit */
 	unsigned long program_regbase;	/*  Base address to set the program pin for the xilinx */
 
-	unsigned long plx_regbase_size;	/*  PLX register set space */
-	unsigned long me4000_regbase_size;	/*  ME4000 register set space */
-	unsigned long timer_regbase_size;	/*  Timer circuit register set space */
-	unsigned long program_regbase_size;	/*  Size of program base address of the ME4000 */
-
 	unsigned int serial_no;	/*  Serial number of the board */
 	unsigned char hw_revision;	/*  Hardware revision of the board */
 	unsigned short vendor_id;	/*  Meilhaus vendor id */