diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-07-18 18:45:04 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-19 16:32:55 -0700 |
| commit | dbd658fc0cf4be8df0c63ed1d70e631f2b606e11 (patch) | |
| tree | 8690d2c22780d3372c53ade40469a3ecb60400cf | |
| parent | 04cec90cd356016296af3030b12aacabd891f393 (diff) | |
staging: comedi: cb_pcidio: store the iobase in the comedi_device
Save the pci bar in dev->iobase instead of carrying it in 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>
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_pcidio.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidio.c b/drivers/staging/comedi/drivers/cb_pcidio.c index 11c7502a2a87..f30f6da1082f 100644 --- a/drivers/staging/comedi/drivers/cb_pcidio.c +++ b/drivers/staging/comedi/drivers/cb_pcidio.c @@ -99,7 +99,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 */ }; /* @@ -165,9 +164,7 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it) if (comedi_pci_enable(pcidev, thisboard->name)) return -EIO; - devpriv->dio_reg_base - = - pci_resource_start(pcidev, thisboard->dioregs_badrindex); + dev->iobase = pci_resource_start(pcidev, thisboard->dioregs_badrindex); ret = comedi_alloc_subdevices(dev, thisboard->n_8255); if (ret) @@ -175,9 +172,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; @@ -188,7 +185,7 @@ static void pcidio_detach(struct comedi_device *dev) struct pci_dev *pcidev = comedi_to_pci_dev(dev); if (pcidev) { - if (devpriv->dio_reg_base) + if (dev->iobase) comedi_pci_disable(pcidev); pci_dev_put(pcidev); } |