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: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index a974ab77293772cc5e44f6467829c9f1502fe114..b2e38288898132004152c1e00d38c8df286e5d43 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -1836,7 +1836,6 @@ static int ni_ai_insn_read(struct comedi_device *dev,
        int i, n;
        unsigned int signbits;
        unsigned int d;
-       unsigned long dl;
 
        ni_load_channelgain_list(dev, s, 1, &insn->chanspec);
 
@@ -1887,15 +1886,15 @@ static int ni_ai_insn_read(struct comedi_device *dev,
                         * bit to move a single 16bit stranded sample into
                         * the FIFO.
                         */
-                       dl = 0;
+                       d = 0;
                        for (i = 0; i < NI_TIMEOUT; i++) {
                                if (ni_readl(dev, NI6143_AI_FIFO_STATUS_REG) &
                                    0x01) {
                                        /* Get stranded sample into FIFO */
                                        ni_writel(dev, 0x01,
                                                  NI6143_AI_FIFO_CTRL_REG);
-                                       dl = ni_readl(dev,
-                                                     NI6143_AI_FIFO_DATA_REG);
+                                       d = ni_readl(dev,
+                                                    NI6143_AI_FIFO_DATA_REG);
                                        break;
                                }
                        }
@@ -1903,7 +1902,7 @@ static int ni_ai_insn_read(struct comedi_device *dev,
                                dev_err(dev->class_dev, "timeout\n");
                                return -ETIME;
                        }
-                       data[n] = (((dl >> 16) & 0xFFFF) + signbits) & 0xFFFF;
+                       data[n] = (((d >> 16) & 0xFFFF) + signbits) & 0xFFFF;
                }
        } else {
                for (n = 0; n < insn->n; n++) {
@@ -1919,9 +1918,9 @@ static int ni_ai_insn_read(struct comedi_device *dev,
                                return -ETIME;
                        }
                        if (devpriv->is_m_series) {
-                               dl = ni_readl(dev, NI_M_AI_FIFO_DATA_REG);
-                               dl &= mask;
-                               data[n] = dl;
+                               d = ni_readl(dev, NI_M_AI_FIFO_DATA_REG);
+                               d &= mask;
+                               data[n] = d;
                        } else {
                                d = ni_readw(dev, NI_E_AI_FIFO_DATA_REG);
                                d += signbits;