From 514b63ad541e7a3fa84a4a84fec2f56317ab3c90 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 13 Nov 2012 13:42:15 -0700 Subject: [PATCH] --- yaml --- r: 337868 b: refs/heads/master c: d330b1da10a2bd0f71c2aa7f9e209b8d06d45901 h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi-data/hwdrv_apci1516.c | 10 +++------- trunk/drivers/staging/comedi/drivers/addi_apci_1516.c | 3 +-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 0cf336062363..c09e6e2fc658 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82c2bc7f50cf587da788c5c90891f5028f6aae9f +refs/heads/master: d330b1da10a2bd0f71c2aa7f9e209b8d06d45901 diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c index 9aa8298f5e5e..0658fe9b45ed 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c +++ b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c @@ -75,9 +75,7 @@ static int apci1516_di_insn_bits(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data) { - struct addi_private *devpriv = dev->private; - - data[1] = inw(devpriv->iobase + APCI1516_DI_REG); + data[1] = inw(dev->iobase + APCI1516_DI_REG); return insn->n; } @@ -87,17 +85,15 @@ static int apci1516_do_insn_bits(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data) { - - struct addi_private *devpriv = dev->private; unsigned int mask = data[0]; unsigned int bits = data[1]; - s->state = inw(devpriv->iobase + APCI1516_DO_REG); + s->state = inw(dev->iobase + APCI1516_DO_REG); if (mask) { s->state &= ~mask; s->state |= (bits & mask); - outw(s->state, devpriv->iobase + APCI1516_DO_REG); + outw(s->state, dev->iobase + APCI1516_DO_REG); } data[1] = s->state; diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c index 6c61f3dc5cb9..dabf44c7360f 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c +++ b/trunk/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);