diff options
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_tio.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_tio_internal.h | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c index ccdf96ed6539..fb7b271ac2a3 100644 --- a/drivers/staging/comedi/drivers/ni_tio.c +++ b/drivers/staging/comedi/drivers/ni_tio.c @@ -184,7 +184,7 @@ static void ni_tio_reset_count_and_disarm(struct ni_gpct *counter) { unsigned cidx = counter->counter_index; - write_register(counter, Gi_Reset_Bit(cidx), NITIO_RESET_REG(cidx)); + write_register(counter, GI_RESET(cidx), NITIO_RESET_REG(cidx)); } static uint64_t ni_tio_clock_period_ps(const struct ni_gpct *counter, diff --git a/drivers/staging/comedi/drivers/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h index 37fde62b0d6e..ea1c9fb269af 100644 --- a/drivers/staging/comedi/drivers/ni_tio_internal.h +++ b/drivers/staging/comedi/drivers/ni_tio_internal.h @@ -126,6 +126,7 @@ #define GI_TC_ERROR(x) (((x) % 2) ? (1 << 13) : (1 << 12)) #define GI_GATE_ERROR(x) (((x) % 2) ? (1 << 15) : (1 << 14)) #define NITIO_RESET_REG(x) (NITIO_G01_RESET + ((x) / 2)) +#define GI_RESET(x) (1 << (2 + ((x) % 2))) #define NITIO_STATUS1_REG(x) (NITIO_G01_STATUS1 + ((x) / 2)) #define NITIO_STATUS2_REG(x) (NITIO_G01_STATUS2 + ((x) / 2)) #define NITIO_DMA_CFG_REG(x) (NITIO_G0_DMA_CFG + (x)) @@ -135,12 +136,6 @@ #define NITIO_STATUS_REG(x) (NITIO_G0_STATUS + (x)) #define NITIO_INT_ENA_REG(x) (NITIO_G0_INT_ENA + (x)) -/* joint reset register bits */ -static inline unsigned Gi_Reset_Bit(unsigned counter_index) -{ - return 0x1 << (2 + (counter_index % 2)); -} - enum Gxx_Joint_Status2_Bits { G0_Output_Bit = 0x1, G1_Output_Bit = 0x2, |