[PATCH 027/107] staging: comedi: ni_stc.h: tidy up NI_M_INTC_STATUS_REG bits

H Hartley Sweeten hsweeten at visionengravers.com
Fri May 1 21:58:52 UTC 2015


Rename the CamelCase and convert enums into defines. Use the BIT()
macro to define the bits.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/ni_stc.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index a29e65a..cc095bf 100644
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -961,6 +961,7 @@ static const struct comedi_lrange range_ni_E_ao_ext;
 #define NI_M_INTC_ENA_REG		0x088
 #define NI_M_INTC_ENA			BIT(0)
 #define NI_M_INTC_STATUS_REG		0x088
+#define NI_M_INTC_STATUS		BIT(0)
 #define NI_M_ATRIG_CTRL_REG		0x08c
 #define NI_M_AO_SER_INT_ENA_REG		0x0a0
 #define NI_M_AO_SER_INT_ACK_REG		0x0a1
@@ -1113,10 +1114,6 @@ static const struct comedi_lrange range_ni_E_ao_ext;
 #define NI_M_AO_REF_ATTENUATION_REG(x)	(0x264 + (x))
 #define NI_M_AO_REF_ATTENUATION_X5	BIT(0)
 
-enum Interrupt_C_Status_Bits {
-	Interrupt_Group_C_Status_Bit = 0x1
-};
-
 #define M_SERIES_EEPROM_SIZE 1024
 
 struct ni_board_struct {
-- 
2.3.0



More information about the devel mailing list