From d65d73ff5e2973274cc216fe37adc801c900dd20 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 4 Nov 2014 10:55:09 -0700 Subject: [PATCH] staging: comedi: addi_apci_3120: rename private data 'b_DmaDoubleBuffer' Rename this CamelCase member of the private data and convert it to a bit-field. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 4 ++-- drivers/staging/comedi/drivers/addi_apci_3120.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index 8327e2c..0275506 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c @@ -360,7 +360,7 @@ static void apci3120_interrupt_dma(int irq, void *d) } samplesinbuf = samplesinbuf >> 1; /* number of received samples */ - if (devpriv->b_DmaDoubleBuffer) { + if (devpriv->use_double_buffer) { struct apci3120_dmabuf *next_dmabuf; next_dmabuf = &devpriv->dmabuf[1 - devpriv->ui_DmaActualBuffer]; @@ -381,7 +381,7 @@ static void apci3120_interrupt_dma(int irq, void *d) return; } - if (devpriv->b_DmaDoubleBuffer) { + if (devpriv->use_double_buffer) { /* switch dma buffers for next interrupt */ devpriv->ui_DmaActualBuffer = 1 - devpriv->ui_DmaActualBuffer; } else { diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c index 00caa10..f768845 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/drivers/staging/comedi/drivers/addi_apci_3120.c @@ -130,7 +130,7 @@ struct apci3120_private { unsigned long addon; unsigned int osc_base; unsigned int use_dma:1; - unsigned char b_DmaDoubleBuffer; + unsigned int use_double_buffer:1; unsigned int ui_DmaActualBuffer; struct apci3120_dmabuf dmabuf[2]; unsigned char do_bits; @@ -469,7 +469,7 @@ static void apci3120_dma_alloc(struct comedi_device *dev) if (i == 0) devpriv->use_dma = 1; if (i == 1) - devpriv->b_DmaDoubleBuffer = 1; + devpriv->use_double_buffer = 1; } } -- 2.7.4