Skip to content

Commit

Permalink
staging: comedi: cb_pcimdas: remove BADR0 from the private data
Browse files Browse the repository at this point in the history
The pci resource bar 0 address is only used as a "flag" to
let the datach function know that the pci device has been
enabled. Use dev->iobase in the detach instead and remove
BADR0 from the private data.

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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 19, 2012
1 parent 6191a3f commit 6d2d7ef
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/staging/comedi/drivers/cb_pcimdas.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ See http://www.mccdaq.com/PDFs/Manuals/pcim-das1602-16.pdf for more details.
/* Registers for the PCIM-DAS1602/16 */

/* sizes of io regions (bytes) */
#define BADR0_SIZE 2 /* ?? */
#define BADR3_SIZE 16

/* DAC Offsets */
Expand Down Expand Up @@ -135,7 +134,6 @@ struct cb_pcimdas_private {
struct pci_dev *pci_dev;

/* base addresses */
unsigned long BADR0;
unsigned long BADR3;

/* Used for AO readback */
Expand Down Expand Up @@ -230,7 +228,6 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
return -EIO;
}

devpriv->BADR0 = pci_resource_start(devpriv->pci_dev, 0);
dev->iobase = pci_resource_start(devpriv->pci_dev, 2);
devpriv->BADR3 = pci_resource_start(devpriv->pci_dev, 3);
iobase_8255 = pci_resource_start(devpriv->pci_dev, 4);
Expand Down Expand Up @@ -290,7 +287,7 @@ static void cb_pcimdas_detach(struct comedi_device *dev)
free_irq(dev->irq, dev);
if (devpriv) {
if (devpriv->pci_dev) {
if (devpriv->BADR0)
if (dev->iobase)
comedi_pci_disable(devpriv->pci_dev);
pci_dev_put(devpriv->pci_dev);
}
Expand Down

0 comments on commit 6d2d7ef

Please sign in to comment.