From: H Hartley Sweeten Date: Tue, 4 Nov 2014 17:55:08 +0000 (-0700) Subject: staging: comedi: addi_apci_3120: rename private data 'us_UseDma' X-Git-Tag: v5.15~16669^2~271 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6539bbc17843b37524fbb419344653bd74b5961;p=platform%2Fkernel%2Flinux-starfive.git 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index c310cf3..8327e2c 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 79a96ac..00caa10 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; }