UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: dyna_pci10xx: use dev->iobase 

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>
This commit is contained in:
H Hartley Sweeten 2012-07-18 19:00:54 -07:00 committed by Greg Kroah-Hartman
parent 87790601cc
commit b694c4f433
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/drivers/dyna_pci10xx.c
View File

@ -104,7 +104,7 @@ struct dyna_pci10xx_private {
struct mutex mutex; struct mutex mutex;
/* device base address registers */ /* device base address registers */
unsigned long BADR2, BADR3; unsigned long BADR3;
}; };
#define thisboard ((const struct boardtype *)dev->board_ptr) #define thisboard ((const struct boardtype *)dev->board_ptr)
@ -132,11 +132,11 @@ static int dyna_pci10xx_insn_read_ai(struct comedi_device *dev,
for (n = 0; n < insn->n; n++) { for (n = 0; n < insn->n; n++) {
/* trigger conversion */ /* trigger conversion */
smp_mb(); smp_mb();
outw_p(0x0000 + range + chan, devpriv->BADR2 + 2); outw_p(0x0000 + range + chan, dev->iobase + 2);
udelay(10); udelay(10);
/* read data */ /* read data */
for (counter = 0; counter < READ_TIMEOUT; counter++) { 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 */ /* check if read is successful if the EOC bit is set */
if (d & (1 << 15)) if (d & (1 << 15))
@ -172,7 +172,7 @@ static int dyna_pci10xx_insn_write_ao(struct comedi_device *dev,
for (n = 0; n < insn->n; n++) { for (n = 0; n < insn->n; n++) {
smp_mb(); smp_mb();
/* trigger conversion and write data */ /* trigger conversion and write data */
outw_p(data[n], devpriv->BADR2); outw_p(data[n], dev->iobase);
udelay(10); udelay(10);
} }
mutex_unlock(&devpriv->mutex); mutex_unlock(&devpriv->mutex);
@ -288,7 +288,7 @@ static int dyna_pci10xx_attach(struct comedi_device *dev,
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); devpriv->BADR3 = pci_resource_start(pcidev, 3);
ret = comedi_alloc_subdevices(dev, 4); ret = comedi_alloc_subdevices(dev, 4);