diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-04 10:55:08 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 09:34:04 -0800 |
| commit | e6539bbc17843b37524fbb419344653bd74b5961 (patch) | |
| tree | 408b90da670463e10add5b2332a80929cfebab96 | |
| parent | ca26b42d4f8c5d9be2a4cc2bf66a19ff71ac036e (diff) | |
staging: comedi: addi_apci_3120: rename private data 'us_UseDma'
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3120.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index c310cf32b1d8..8327e2c26084 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c @@ -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; diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c index 79a96acc8b63..00caa1059db1 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/drivers/staging/comedi/drivers/addi_apci_3120.c @@ -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; } |