staging: comedi: ni_pcidio: sample types are unsigned
authorIan Abbott <abbotti@mev.co.uk>
Wed, 16 Oct 2013 13:40:27 +0000 (14:40 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Oct 2013 19:48:30 +0000 (12:48 -0700)
Sample values in comedi are generally represented as unsigned values.
Change `nidio_interrupt()` to use unsigned types for sample values
(actually bit-vectors of 1-bit sample values) instead of signed types.

Also rename the `AuxData` variable to `auxdata` and change it from
`long` to `unsigned int` as it only needs to hold a 32-bit value.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ni_pcidio.c

index b6283a8a7cd488a4e1ba41733ff84ded1311c4f9..e3a8fa96d9b398fa13c8e8f564967393d20e1d5c 100644 (file)
@@ -406,9 +406,9 @@ static irqreturn_t nidio_interrupt(int irq, void *d)
        struct mite_struct *mite = devpriv->mite;
 
        /* int i, j; */
-       long int AuxData = 0;
-       short data1 = 0;
-       short data2 = 0;
+       unsigned int auxdata = 0;
+       unsigned short data1 = 0;
+       unsigned short data2 = 0;
        int flags;
        int status;
        int work = 0;
@@ -481,11 +481,11 @@ static irqreturn_t nidio_interrupt(int irq, void *d)
                                              );
                                        goto out;
                                }
-                               AuxData =
+                               auxdata =
                                    readl(devpriv->mite->daq_io_addr +
                                          Group_1_FIFO);
-                               data1 = AuxData & 0xffff;
-                               data2 = (AuxData & 0xffff0000) >> 16;
+                               data1 = auxdata & 0xffff;
+                               data2 = (auxdata & 0xffff0000) >> 16;
                                comedi_buf_put(async, data1);
                                comedi_buf_put(async, data2);
                                /* DPRINTK("read:%d, %d\n",data1,data2); */