leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: ni_660x: remove enum clock_config_register_bits

Browse Source 
Remove this enum and add a define for the bit.

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 2016-03-22 11:10:18 -07:00 committed by Greg Kroah-Hartman
parent aa36af205e
commit 502552e161
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/comedi/drivers/ni_660x.c
View File

@ -155,6 +155,8 @@ enum ni_660x_register {
NI660X_NUM_REGS,
};
#define NI660X_CLK_CFG_COUNTER_SWAP BIT(21)
#define NI660X_IO_CFG(x) (NI660X_IO_CFG_0_1 + ((x) / 2))
#define NI660X_IO_CFG_OUT_SEL(_c, _s) (((_s) & 0x3) << (((_c) % 2) ? 0 : 8))
#define NI660X_IO_CFG_OUT_SEL_MASK(_c) NI660X_IO_CFG_OUT_SEL((_c), 0x3)
@ -280,11 +282,6 @@ static const struct ni_660x_register_data ni_660x_reg_data[NI660X_NUM_REGS] = {
[NI660X_IO_CFG_38_39] = { 0x7a2, 2 } /* read/write */
};
/* kind of ENABLE for the second counter */
enum clock_config_register_bits {
CounterSwap = 0x1 << 21
};
/* dma configuration register bits */
static inline unsigned dma_select_mask(unsigned dma_channel)
{
@ -704,7 +701,7 @@ static void set_tio_counterswap(struct comedi_device *dev, int chip)
* first chip.
*/
if (chip)
bits = CounterSwap;
bits = NI660X_CLK_CFG_COUNTER_SWAP;
ni_660x_write_register(dev, chip, bits, NI660X_CLK_CFG);
}