staging: comedi: addi_apci_3120: rename private data 'us_UseDma'
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 4 Nov 2014 17:55:08 +0000 (10:55 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Nov 2014 17:34:04 +0000 (09:34 -0800)
Rename this CamelCase member of the private data and convert it to
a bit-field.

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>
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
drivers/staging/comedi/drivers/addi_apci_3120.c

index c310cf3..8327e2c 100644 (file)
@@ -293,7 +293,7 @@ static int apci3120_ai_cmd(struct comedi_device *dev,
        apci3120_timer_set_mode(dev, 0, APCI3120_TIMER_MODE2);
        apci3120_timer_write(dev, 0, divisor);
 
-       if (devpriv->us_UseDma) {
+       if (devpriv->use_dma) {
                apci3120_setup_dma(dev, s);
        } else {
                devpriv->mode |= APCI3120_MODE_EOS_IRQ_ENA;
index 79a96ac..00caa10 100644 (file)
@@ -129,7 +129,7 @@ struct apci3120_private {
        unsigned long amcc;
        unsigned long addon;
        unsigned int osc_base;
-       unsigned short us_UseDma;
+       unsigned int use_dma:1;
        unsigned char b_DmaDoubleBuffer;
        unsigned int ui_DmaActualBuffer;
        struct apci3120_dmabuf dmabuf[2];
@@ -467,7 +467,7 @@ static void apci3120_dma_alloc(struct comedi_device *dev)
                dmabuf->size = PAGE_SIZE << order;
 
                if (i == 0)
-                       devpriv->us_UseDma = 1;
+                       devpriv->use_dma = 1;
                if (i == 1)
                        devpriv->b_DmaDoubleBuffer = 1;
        }