summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
8779060)
Use dev->iobase to hold one of the pci base addresses used
by the driver 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>
struct mutex mutex;
/* device base address registers */
struct mutex mutex;
/* device base address registers */
- unsigned long BADR2, BADR3;
};
#define thisboard ((const struct boardtype *)dev->board_ptr)
};
#define thisboard ((const struct boardtype *)dev->board_ptr)
for (n = 0; n < insn->n; n++) {
/* trigger conversion */
smp_mb();
for (n = 0; n < insn->n; n++) {
/* trigger conversion */
smp_mb();
- outw_p(0x0000 + range + chan, devpriv->BADR2 + 2);
+ outw_p(0x0000 + range + chan, dev->iobase + 2);
udelay(10);
/* read data */
for (counter = 0; counter < READ_TIMEOUT; counter++) {
udelay(10);
/* read data */
for (counter = 0; counter < READ_TIMEOUT; counter++) {
- d = inw_p(devpriv->BADR2);
+ d = inw_p(dev->iobase);
/* check if read is successful if the EOC bit is set */
if (d & (1 << 15))
/* check if read is successful if the EOC bit is set */
if (d & (1 << 15))
for (n = 0; n < insn->n; n++) {
smp_mb();
/* trigger conversion and write data */
for (n = 0; n < insn->n; n++) {
smp_mb();
/* trigger conversion and write data */
- outw_p(data[n], devpriv->BADR2);
+ outw_p(data[n], dev->iobase);
udelay(10);
}
mutex_unlock(&devpriv->mutex);
udelay(10);
}
mutex_unlock(&devpriv->mutex);
printk(KERN_INFO "comedi: dyna_pci10xx: device found!\n");
printk(KERN_INFO "comedi: dyna_pci10xx: device found!\n");
- devpriv->BADR2 = pci_resource_start(pcidev, 2);
+ dev->iobase = pci_resource_start(pcidev, 2);
devpriv->BADR3 = pci_resource_start(pcidev, 3);
ret = comedi_alloc_subdevices(dev, 4);
devpriv->BADR3 = pci_resource_start(pcidev, 3);
ret = comedi_alloc_subdevices(dev, 4);