summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-07-18 19:00:37 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-19 16:51:37 -0700
commit87790601cc603ea657fa667dd329fb21f318dfa9 (patch)
treed3eb915a462edb9c487db7deb442f3cdc45cd06d
parent423e0e3f551212df86d4e06287d253c2ae26e8dd (diff)
downloadlinux-3.10-87790601cc603ea657fa667dd329fb21f318dfa9.tar.gz
linux-3.10-87790601cc603ea657fa667dd329fb21f318dfa9.tar.bz2
linux-3.10-87790601cc603ea657fa667dd329fb21f318dfa9.zip
staging: comedi: dyna_pci10xx: remove unused bars from the private data
All of the pci device base address registers are saved in the private data but only bar2 and bar3 are used by the driver. Remove the others. 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/dyna_pci10xx.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index 24c5cd270ce..95ee4223732 100644
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -104,7 +104,7 @@ struct dyna_pci10xx_private {
struct mutex mutex;
/* device base address registers */
- unsigned long BADR0, BADR1, BADR2, BADR3, BADR4, BADR5;
+ unsigned long BADR2, BADR3;
};
#define thisboard ((const struct boardtype *)dev->board_ptr)
@@ -288,13 +288,8 @@ static int dyna_pci10xx_attach(struct comedi_device *dev,
printk(KERN_INFO "comedi: dyna_pci10xx: device found!\n");
- /* initialize device base address registers */
- devpriv->BADR0 = pci_resource_start(pcidev, 0);
- devpriv->BADR1 = pci_resource_start(pcidev, 1);
devpriv->BADR2 = pci_resource_start(pcidev, 2);
devpriv->BADR3 = pci_resource_start(pcidev, 3);
- devpriv->BADR4 = pci_resource_start(pcidev, 4);
- devpriv->BADR5 = pci_resource_start(pcidev, 5);
ret = comedi_alloc_subdevices(dev, 4);
if (ret)