evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: ni_tiocmd: tidy up ni_tio_configure_dma()

Browse source 
The 'enable' and 'read_not_write' parameters are true/false flags. For
aesthetics, change their types to bool.

Rename the local variable 'input_select_bits' to simply 'bits' and reuse
it when enabling the dma on the m series and 660x counter variants.

Add a local variable for the 'mask' that is passed to ni_tio_set_bits()
to help clarify the code.

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>
This commit is contained in:
H Hartley Sweeten 2014-07-28 10:27:01 -07:00 • committed by Greg Kroah-Hartman
parent 613117fbfe
commit 65dbae525f
1 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
drivers/staging/comedi/drivers/ni_tiocmd.c
View file

@ -49,40 +49,38 @@ TODO:
#include "ni_tio_internal.h" #include "ni_tio_internal.h"
#include "mite.h" #include "mite.h"
static void ni_tio_configure_dma(struct ni_gpct *counter, short enable, static void ni_tio_configure_dma(struct ni_gpct *counter,
short read_not_write) bool enable, bool read)
{ {
struct ni_gpct_device *counter_dev = counter->counter_dev; struct ni_gpct_device *counter_dev = counter->counter_dev;
unsigned cidx = counter->counter_index; unsigned cidx = counter->counter_index;
unsigned input_select_bits = 0; unsigned mask;
unsigned bits;
mask = GI_READ_ACKS_IRQ | GI_WRITE_ACKS_IRQ;
bits = 0;
if (enable) { if (enable) {
if (read_not_write) if (read)
input_select_bits |= GI_READ_ACKS_IRQ; bits |= GI_READ_ACKS_IRQ;
else else
input_select_bits |= GI_WRITE_ACKS_IRQ; bits |= GI_WRITE_ACKS_IRQ;
} }
ni_tio_set_bits(counter, NITIO_INPUT_SEL_REG(cidx), ni_tio_set_bits(counter, NITIO_INPUT_SEL_REG(cidx), mask, bits);
GI_READ_ACKS_IRQ | GI_WRITE_ACKS_IRQ,
input_select_bits);
switch (counter_dev->variant) { switch (counter_dev->variant) {
case ni_gpct_variant_e_series: case ni_gpct_variant_e_series:
break; break;
case ni_gpct_variant_m_series: case ni_gpct_variant_m_series:
case ni_gpct_variant_660x: case ni_gpct_variant_660x:
{ mask = GI_DMA_ENABLE | GI_DMA_INT_ENA | GI_DMA_WRITE;
unsigned gi_dma_config_bits = 0; bits = 0;
if (enable) { if (enable)
gi_dma_config_bits |= GI_DMA_ENABLE; bits |= GI_DMA_ENABLE | GI_DMA_INT_ENA;
gi_dma_config_bits |= GI_DMA_INT_ENA; if (!read)
} bits |= GI_DMA_WRITE;
if (read_not_write == 0) ni_tio_set_bits(counter, NITIO_DMA_CFG_REG(cidx), mask, bits);
gi_dma_config_bits |= GI_DMA_WRITE;
ni_tio_set_bits(counter, NITIO_DMA_CFG_REG(cidx),
GI_DMA_ENABLE | GI_DMA_INT_ENA |
GI_DMA_WRITE, gi_dma_config_bits);
}
break; break;
} }
} }
@ -140,7 +138,7 @@ static int ni_tio_input_cmd(struct comedi_subdevice *s)
break; break;
} }
ni_tio_set_bits(counter, NITIO_CMD_REG(cidx), GI_SAVE_TRACE, 0); ni_tio_set_bits(counter, NITIO_CMD_REG(cidx), GI_SAVE_TRACE, 0);
ni_tio_configure_dma(counter, 1, 1); ni_tio_configure_dma(counter, true, true);
switch (cmd->start_src) { switch (cmd->start_src) {
case TRIG_NOW: case TRIG_NOW:
async->inttrig = NULL; async->inttrig = NULL;
@ -176,7 +174,7 @@ static int ni_tio_output_cmd(struct comedi_subdevice *s)
counter->mite_chan->dir = COMEDI_OUTPUT; counter->mite_chan->dir = COMEDI_OUTPUT;
mite_prep_dma(counter->mite_chan, 32, 32); mite_prep_dma(counter->mite_chan, 32, 32);
ni_tio_configure_dma(counter, 1, 0); ni_tio_configure_dma(counter, true, false);
mite_dma_arm(counter->mite_chan); mite_dma_arm(counter->mite_chan);
return ni_tio_arm(counter, 1, NI_GPCT_ARM_IMMEDIATE); return ni_tio_arm(counter, 1, NI_GPCT_ARM_IMMEDIATE);
} }
@ -319,7 +317,7 @@ int ni_tio_cancel(struct ni_gpct *counter)
if (counter->mite_chan) if (counter->mite_chan)
mite_dma_disarm(counter->mite_chan); mite_dma_disarm(counter->mite_chan);
spin_unlock_irqrestore(&counter->lock, flags); spin_unlock_irqrestore(&counter->lock, flags);
ni_tio_configure_dma(counter, 0, 0); ni_tio_configure_dma(counter, false, false);
ni_tio_set_bits(counter, NITIO_INT_ENA_REG(cidx), ni_tio_set_bits(counter, NITIO_INT_ENA_REG(cidx),
GI_GATE_INTERRUPT_ENABLE(cidx), 0x0); GI_GATE_INTERRUPT_ENABLE(cidx), 0x0);