lkml.org 
[lkml]   [2012]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 52/90] staging: comedi: cb_pcimdas: remove BADR4 from the private data
Date
The pci resource bar 4 address is only needed to initialize the
8255 subdevice. Use a local variable to hold it and remove it
from the private data.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/comedi/drivers/cb_pcimdas.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index 3902c85bc..c8df680 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -59,7 +59,6 @@ See http://www.mccdaq.com/PDFs/Manuals/pcim-das1602-16.pdf for more details.
#define BADR0_SIZE 2 /* ?? */
#define BADR2_SIZE 6
#define BADR3_SIZE 16
-#define BADR4_SIZE 4

/* DAC Offsets */
#define ADC_TRIG 0
@@ -140,7 +139,6 @@ struct cb_pcimdas_private {
unsigned long BADR0;
unsigned long BADR2;
unsigned long BADR3;
- unsigned long BADR4;

/* Used for AO readback */
unsigned int ao_readback[2];
@@ -204,6 +202,7 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
{
struct pci_dev *pcidev;
struct comedi_subdevice *s;
+ unsigned long iobase_8255;
int ret;

/*
@@ -236,7 +235,7 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
devpriv->BADR0 = pci_resource_start(devpriv->pci_dev, 0);
devpriv->BADR2 = pci_resource_start(devpriv->pci_dev, 2);
devpriv->BADR3 = pci_resource_start(devpriv->pci_dev, 3);
- devpriv->BADR4 = pci_resource_start(devpriv->pci_dev, 4);
+ iobase_8255 = pci_resource_start(devpriv->pci_dev, 4);

/* Dont support IRQ yet */
/* get irq */
@@ -280,7 +279,7 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
s = dev->subdevices + 2;
/* digital i/o subdevice */
if (thisboard->has_dio)
- subdev_8255_init(dev, s, NULL, devpriv->BADR4);
+ subdev_8255_init(dev, s, NULL, iobase_8255);
else
s->type = COMEDI_SUBD_UNUSED;

--
1.7.11


\
 
 \ /
  Last update: 2012-07-19 04:42    [W:0.027 / U:0.912 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site