From 0818dc0a35571c294540cc8531f071e01f915205 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 7 Sep 2012 17:41:55 -0700
Subject: [PATCH] staging: comedi: me4000: don't save the pci resource sizes
There is no need to get the resource size for each pci bar. Nothing
in the driver uses it.
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>
---
drivers/staging/comedi/drivers/me4000.c | 4 ----
drivers/staging/comedi/drivers/me4000.h | 5 -----
2 files changed, 9 deletions(-)
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 081e509f213b7..eeca9711dde1b 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/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/drivers/staging/comedi/drivers/me4000.h b/drivers/staging/comedi/drivers/me4000.h
index 6c03d54c649ab..169fed832f72f 100644
--- a/drivers/staging/comedi/drivers/me4000.h
+++ b/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 */
--
2.30.2