Commit e3007002 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: ni_mio_common: remove variable 'dl' in ni_ai_insn_read()

In `ni_ai_insn_read()`, local variable `dl` is declared as `unsigned
long`, but `unsigned int` will do.  Get rid of it and use local variable
`d` instead.  (That used to be `unsigned short`, but has been `unsigned
int` since kernel version 3.18.)
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 857a6610
...@@ -1836,7 +1836,6 @@ static int ni_ai_insn_read(struct comedi_device *dev, ...@@ -1836,7 +1836,6 @@ static int ni_ai_insn_read(struct comedi_device *dev,
int i, n; int i, n;
unsigned int signbits; unsigned int signbits;
unsigned int d; unsigned int d;
unsigned long dl;
ni_load_channelgain_list(dev, s, 1, &insn->chanspec); ni_load_channelgain_list(dev, s, 1, &insn->chanspec);
...@@ -1887,14 +1886,14 @@ static int ni_ai_insn_read(struct comedi_device *dev, ...@@ -1887,14 +1886,14 @@ static int ni_ai_insn_read(struct comedi_device *dev,
* bit to move a single 16bit stranded sample into * bit to move a single 16bit stranded sample into
* the FIFO. * the FIFO.
*/ */
dl = 0; d = 0;
for (i = 0; i < NI_TIMEOUT; i++) { for (i = 0; i < NI_TIMEOUT; i++) {
if (ni_readl(dev, NI6143_AI_FIFO_STATUS_REG) & if (ni_readl(dev, NI6143_AI_FIFO_STATUS_REG) &
0x01) { 0x01) {
/* Get stranded sample into FIFO */ /* Get stranded sample into FIFO */
ni_writel(dev, 0x01, ni_writel(dev, 0x01,
NI6143_AI_FIFO_CTRL_REG); NI6143_AI_FIFO_CTRL_REG);
dl = ni_readl(dev, d = ni_readl(dev,
NI6143_AI_FIFO_DATA_REG); NI6143_AI_FIFO_DATA_REG);
break; break;
} }
...@@ -1903,7 +1902,7 @@ static int ni_ai_insn_read(struct comedi_device *dev, ...@@ -1903,7 +1902,7 @@ static int ni_ai_insn_read(struct comedi_device *dev,
dev_err(dev->class_dev, "timeout\n"); dev_err(dev->class_dev, "timeout\n");
return -ETIME; return -ETIME;
} }
data[n] = (((dl >> 16) & 0xFFFF) + signbits) & 0xFFFF; data[n] = (((d >> 16) & 0xFFFF) + signbits) & 0xFFFF;
} }
} else { } else {
for (n = 0; n < insn->n; n++) { for (n = 0; n < insn->n; n++) {
...@@ -1919,9 +1918,9 @@ static int ni_ai_insn_read(struct comedi_device *dev, ...@@ -1919,9 +1918,9 @@ static int ni_ai_insn_read(struct comedi_device *dev,
return -ETIME; return -ETIME;
} }
if (devpriv->is_m_series) { if (devpriv->is_m_series) {
dl = ni_readl(dev, NI_M_AI_FIFO_DATA_REG); d = ni_readl(dev, NI_M_AI_FIFO_DATA_REG);
dl &= mask; d &= mask;
data[n] = dl; data[n] = d;
} else { } else {
d = ni_readw(dev, NI_E_AI_FIFO_DATA_REG); d = ni_readw(dev, NI_E_AI_FIFO_DATA_REG);
d += signbits; d += signbits;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment