Use the iobase in the comedi_device struct instead of carrying it
in the private data.
Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/staging/comedi/drivers/cb_pcidio.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcidio.c
b/drivers/staging/comedi/drivers/cb_pcidio.c
index a21ae2b..cab96b0 100644
--- a/drivers/staging/comedi/drivers/cb_pcidio.c
+++ b/drivers/staging/comedi/drivers/cb_pcidio.c
@@ -98,8 +98,6 @@ struct pcidio_private {
/* used for DO readback, currently unused */
unsigned int do_readback[4]; /* up to 4 unsigned int suffice to hold
96 bits for PCI-DIO96 */
-
- unsigned long dio_reg_base; /* address of port A of the first 8255
chip on board */
};
/*
@@ -162,10 +160,8 @@ static int pcidio_attach(struct comedi_device *dev, struct
comedi_devconfig *it)
if (comedi_pci_enable(dev->pcidev, thisboard->name))
return -EIO;
- devpriv->dio_reg_base
- =
- pci_resource_start(dev->pcidev,
- thisboard->dioregs_badrindex);
+ dev->iobase = pci_resource_start(dev->pcidev,
+ thisboard->dioregs_badrindex);
ret = comedi_alloc_subdevices(dev, thisboard->n_8255);
if (ret)
@@ -173,9 +169,9 @@ static int pcidio_attach(struct comedi_device *dev, struct
comedi_devconfig *it)
for (i = 0; i < thisboard->n_8255; i++) {
subdev_8255_init(dev, dev->subdevices + i,
- NULL, devpriv->dio_reg_base + i * 4);
+ NULL, dev->iobase + i * 4);
dev_dbg(dev->class_dev, "subdev %d: base = 0x%lx\n", i,
- devpriv->dio_reg_base + i * 4);
+ dev->iobase + i * 4);
}
return 1;
@@ -184,7 +180,7 @@ static int pcidio_attach(struct comedi_device *dev, struct
comedi_devconfig *it)
static void pcidio_detach(struct comedi_device *dev)
{
if (dev->pcidev) {
- if (devpriv && devpriv->dio_reg_base)
+ if (dev->iobase)
comedi_pci_disable(dev->pcidev);
pci_dev_put(dev->pcidev);
}
--
1.7.11
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
