Remove this enum and add a define for the bit.
Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/comedi/drivers/ni_660x.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_660x.c
b/drivers/staging/comedi/drivers/ni_660x.c
index ab761aa..30089cd 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -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);
}
--
2.6.3
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
