summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/ni_tiocmd.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-07-28 10:26:56 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-30 16:51:00 -0700
commit150dde701f8cae00ecb0084316a9e60f5046de9c (patch)
tree69f54e320c731b95cb4ec6e752be52430ae8b9ed /drivers/staging/comedi/drivers/ni_tiocmd.c
parent29c2003d11a57c88d99e892e9dd26b36d29ae454 (diff)
staging: comedi: ni_tio: tidy up Gi_DMA_Config_Reg_Bits
Convert this enum into defines and rename the CamelCase symbols. For aesthetics, move the new defines so they are associated with the register define. 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>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_tiocmd.c')
-rw-r--r--drivers/staging/comedi/drivers/ni_tiocmd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c
index 9ba40794ac21..d80bb35aed40 100644
--- a/drivers/staging/comedi/drivers/ni_tiocmd.c
+++ b/drivers/staging/comedi/drivers/ni_tiocmd.c
@@ -74,14 +74,14 @@ static void ni_tio_configure_dma(struct ni_gpct *counter, short enable,
unsigned gi_dma_config_bits = 0;
if (enable) {
- gi_dma_config_bits |= Gi_DMA_Enable_Bit;
- gi_dma_config_bits |= Gi_DMA_Int_Bit;
+ gi_dma_config_bits |= GI_DMA_ENABLE;
+ gi_dma_config_bits |= GI_DMA_INT_ENA;
}
if (read_not_write == 0)
- gi_dma_config_bits |= Gi_DMA_Write_Bit;
+ gi_dma_config_bits |= GI_DMA_WRITE;
ni_tio_set_bits(counter, NITIO_DMA_CFG_REG(cidx),
- Gi_DMA_Enable_Bit | Gi_DMA_Int_Bit |
- Gi_DMA_Write_Bit, gi_dma_config_bits);
+ GI_DMA_ENABLE | GI_DMA_INT_ENA |
+ GI_DMA_WRITE, gi_dma_config_bits);
}
break;
}