summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/addi_apci_1516.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-11-13 13:42:15 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-13 15:12:48 -0800
commitd330b1da10a2bd0f71c2aa7f9e209b8d06d45901 (patch)
tree3963f69f244afbdb0c5f1107b845f49e30f04f08 /drivers/staging/comedi/drivers/addi_apci_1516.c
parent82c2bc7f50cf587da788c5c90891f5028f6aae9f (diff)
staging: comedi: addi_apci_1516: remove devpriv->iobase usage
The iobase address stored in devpriv->iobase is also stored in dev->iobase. Use that instead. 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>
Diffstat (limited to 'drivers/staging/comedi/drivers/addi_apci_1516.c')
-rw-r--r--drivers/staging/comedi/drivers/addi_apci_1516.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index 6c61f3dc5cb9..dabf44c7360f 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -35,7 +35,7 @@ static int apci1516_reset(struct comedi_device *dev)
if (!this_board->i_Timer)
return 0;
- outw(0x0, devpriv->iobase + APCI1516_DO_REG);
+ outw(0x0, dev->iobase + APCI1516_DO_REG);
outw(0x0, devpriv->i_IobaseAddon + APCI1516_WDOG_CTRL_REG);
outw(0x0, devpriv->i_IobaseAddon + APCI1516_WDOG_RELOAD_LSB_REG);
outw(0x0, devpriv->i_IobaseAddon + APCI1516_WDOG_RELOAD_MSB_REG);
@@ -85,7 +85,6 @@ static int __devinit apci1516_auto_attach(struct comedi_device *dev,
return ret;
dev->iobase = pci_resource_start(pcidev, 1);
- devpriv->iobase = dev->iobase;
devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);
devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3);