summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-11-21 22:22:28 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-27 00:39:59 +0100
commit24001039a4618e80cdf44a2b2970001dd8e63029 (patch)
treee96c6861db490730e9ddd5803419a60ea1034581 /drivers
parentstaging: comedi: adv_pci1723: tidy up register map (diff)
downloadlinux-24001039a4618e80cdf44a2b2970001dd8e63029.tar.xz
linux-24001039a4618e80cdf44a2b2970001dd8e63029.zip
staging: comedi: adv_pci1723: remove private data 'da_range'
This member of the private data is initialized to 0 by pci1723_reset() and is not used any where else in the driver. Remove it. Use the register map defines to set the range for each output channel. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/adv_pci1723.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c
index 51349893fb95..87f78367fe95 100644
--- a/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -86,7 +86,6 @@ TODO:
#define PCI1723_VREF_POS10V (3 << 0)
struct pci1723_private {
- unsigned char da_range[8]; /* D/A output range for each channel */
unsigned short ao_data[8]; /* data output buffer */
};
@@ -105,8 +104,7 @@ static int pci1723_reset(struct comedi_device *dev)
devpriv->ao_data[i] = 0x8000;
outw(devpriv->ao_data[i], dev->iobase + PCI1723_AO_REG(i));
/* set all ranges to +/- 10V */
- devpriv->da_range[i] = 0;
- outw(((devpriv->da_range[i] << 4) | i),
+ outw(PCI1723_CTRL_RANGE(0) | PCI1723_CTRL_CHAN(i),
PCI1723_CTRL_REG);
}