2 files changed, 8 insertions, 32 deletions

diff --git a/drivers/staging/comedi/drivers/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h
index db6b56307db9..8d1b254c37aa 100644
--- a/drivers/staging/comedi/drivers/ni_tio_internal.h
+++ b/drivers/staging/comedi/drivers/ni_tio_internal.h
@@ -144,37 +144,13 @@
 #define GI_DRQ_STATUS			(1 << 15)
 #define NITIO_ABZ_REG(x)		(NITIO_G0_ABZ + (x))
 #define NITIO_INT_ACK_REG(x)		(NITIO_G0_INT_ACK + (x))
+#define GI_GATE_ERROR_CONFIRM(x)	(((x) % 2) ? (1 << 1) : (1 << 5))
+#define GI_TC_ERROR_CONFIRM(x)		(((x) % 2) ? (1 << 2) : (1 << 6))
+#define GI_TC_INTERRUPT_ACK		(1 << 14)
+#define GI_GATE_INTERRUPT_ACK		(1 << 15)
 #define NITIO_STATUS_REG(x)		(NITIO_G0_STATUS + (x))
 #define NITIO_INT_ENA_REG(x)		(NITIO_G0_INT_ENA + (x))
 
-enum G02_Interrupt_Acknowledge_Bits {
-	G0_Gate_Error_Confirm_Bit = 0x20,
-	G0_TC_Error_Confirm_Bit = 0x40
-};
-enum G13_Interrupt_Acknowledge_Bits {
-	G1_Gate_Error_Confirm_Bit = 0x2,
-	G1_TC_Error_Confirm_Bit = 0x4
-};
-static inline unsigned Gi_Gate_Error_Confirm_Bit(unsigned counter_index)
-{
-	if (counter_index % 2)
-		return G1_Gate_Error_Confirm_Bit;
-	return G0_Gate_Error_Confirm_Bit;
-}
-
-static inline unsigned Gi_TC_Error_Confirm_Bit(unsigned counter_index)
-{
-	if (counter_index % 2)
-		return G1_TC_Error_Confirm_Bit;
-	return G0_TC_Error_Confirm_Bit;
-}
-
-/* bits that are the same in G0/G2 and G1/G3 interrupt acknowledge registers */
-enum Gxx_Interrupt_Acknowledge_Bits {
-	Gi_TC_Interrupt_Ack_Bit = 0x4000,
-	Gi_Gate_Interrupt_Ack_Bit = 0x8000
-};
-
 enum Gi_Status_Bits {
 	Gi_Gate_Interrupt_Bit = 0x4,
 	Gi_TC_Bit = 0x8,
diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c
index f8019bf57ea5..43a7bee55052 100644
--- a/drivers/staging/comedi/drivers/ni_tiocmd.c
+++ b/drivers/staging/comedi/drivers/ni_tiocmd.c
@@ -378,7 +378,7 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error,
 		*stale_data = 0;
 
 	if (gxx_status & GI_GATE_ERROR(cidx)) {
-		ack |= Gi_Gate_Error_Confirm_Bit(cidx);
+		ack |= GI_GATE_ERROR_CONFIRM(cidx);
 		if (gate_error) {
 			/*660x don't support automatic acknowledgement
 			  of gate interrupt via dma read/write
@@ -390,15 +390,15 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error,
 		}
 	}
 	if (gxx_status & GI_TC_ERROR(cidx)) {
-		ack |= Gi_TC_Error_Confirm_Bit(cidx);
+		ack |= GI_TC_ERROR_CONFIRM(cidx);
 		if (tc_error)
 			*tc_error = 1;
 	}
 	if (gi_status & Gi_TC_Bit)
-		ack |= Gi_TC_Interrupt_Ack_Bit;
+		ack |= GI_TC_INTERRUPT_ACK;
 	if (gi_status & Gi_Gate_Interrupt_Bit) {
 		if (should_ack_gate(counter))
-			ack |= Gi_Gate_Interrupt_Ack_Bit;
+			ack |= GI_GATE_INTERRUPT_ACK;
 	}
 	if (ack)
 		write_register(counter, ack, NITIO_INT_ACK_REG(cidx));