From b694c4f4339bf4126e944def8318ff4f5cfbee76 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 18 Jul 2012 19:00:54 -0700 Subject: [PATCH] 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/dyna_pci10xx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c index 95ee422..e7086b1 100644 --- a/drivers/staging/comedi/drivers/dyna_pci10xx.c +++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c @@ -104,7 +104,7 @@ struct dyna_pci10xx_private { struct mutex mutex; /* device base address registers */ - unsigned long BADR2, BADR3; + unsigned long BADR3; }; #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++) { /* 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++) { - 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)) @@ -172,7 +172,7 @@ static int dyna_pci10xx_insn_write_ao(struct comedi_device *dev, 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); @@ -288,7 +288,7 @@ static int dyna_pci10xx_attach(struct comedi_device *dev, 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); -- 2.7.4