staging: comedi: ni_stc.h: tidy up NI_M_CDIO_CMD_REG bits

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

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>

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 8cdcc1b..acba138 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -3446,8 +3446,9 @@ static int ni_cdo_inttrig(struct comedi_device *dev,
                s->cancel(dev, s);
                return -EIO;
        }
-       ni_writel(dev, CDO_Arm_Bit | CDO_Error_Interrupt_Enable_Set_Bit |
-                      CDO_Empty_FIFO_Interrupt_Enable_Set_Bit,
+       ni_writel(dev, NI_M_CDO_CMD_ARM |
+                      NI_M_CDO_CMD_ERR_INT_ENA_SET |
+                      NI_M_CDO_CMD_F_E_INT_ENA_SET,
                  NI_M_CDIO_CMD_REG);
        return retval;
 }
@@ -3458,7 +3459,7 @@ static int ni_cdio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
        unsigned cdo_mode_bits = CDO_FIFO_Mode_Bit | CDO_Halt_On_Error_Bit;
        int retval;
 
-       ni_writel(dev, CDO_Reset_Bit, NI_M_CDIO_CMD_REG);
+       ni_writel(dev, NI_M_CDO_CMD_RESET, NI_M_CDIO_CMD_REG);
        switch (cmd->scan_begin_src) {
        case TRIG_EXT:
                cdo_mode_bits |=
@@ -3474,7 +3475,7 @@ static int ni_cdio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
        ni_writel(dev, cdo_mode_bits, NI_M_CDO_MODE_REG);
        if (s->io_bits) {
                ni_writel(dev, s->state, NI_M_CDO_FIFO_DATA_REG);
-               ni_writel(dev, CDO_SW_Update_Bit, NI_M_CDIO_CMD_REG);
+               ni_writel(dev, NI_M_CDO_CMD_SW_UPDATE, NI_M_CDIO_CMD_REG);
                ni_writel(dev, s->io_bits, NI_M_CDO_MASK_ENA_REG);
        } else {
                dev_err(dev->class_dev,
@@ -3492,9 +3493,10 @@ static int ni_cdio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
 static int ni_cdio_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
-       ni_writel(dev, CDO_Disarm_Bit | CDO_Error_Interrupt_Enable_Clear_Bit |
-                      CDO_Empty_FIFO_Interrupt_Enable_Clear_Bit |
-                      CDO_FIFO_Request_Interrupt_Enable_Clear_Bit,
+       ni_writel(dev, NI_M_CDO_CMD_DISARM |
+                      NI_M_CDO_CMD_ERR_INT_ENA_CLR |
+                      NI_M_CDO_CMD_F_E_INT_ENA_CLR |
+                      NI_M_CDO_CMD_F_REQ_INT_ENA_CLR,
                  NI_M_CDIO_CMD_REG);
        /*
         * XXX not sure what interrupt C group does
@@ -3534,12 +3536,12 @@ static void handle_cdio_interrupt(struct comedi_device *dev)
        cdio_status = ni_readl(dev, NI_M_CDIO_STATUS_REG);
        if (cdio_status & NI_M_CDIO_STATUS_CDO_ERROR) {
                /* XXX just guessing this is needed and does something useful */
-               ni_writel(dev, CDO_Error_Interrupt_Confirm_Bit,
+               ni_writel(dev, NI_M_CDO_CMD_ERR_INT_CONFIRM,
                          NI_M_CDIO_CMD_REG);
                s->async->events |= COMEDI_CB_OVERFLOW;
        }
        if (cdio_status & NI_M_CDIO_STATUS_CDO_FIFO_EMPTY) {
-               ni_writel(dev, CDO_Empty_FIFO_Interrupt_Enable_Clear_Bit,
+               ni_writel(dev, NI_M_CDO_CMD_F_E_INT_ENA_CLR,
                          NI_M_CDIO_CMD_REG);
                /* s->async->events |= COMEDI_CB_EOA; */
        }
@@ -5313,7 +5315,8 @@ static int ni_E_init(struct comedi_device *dev,
                }
 
                /* reset DIO and set all channels to inputs */
-               ni_writel(dev, CDO_Reset_Bit | CDI_Reset_Bit,
+               ni_writel(dev, NI_M_CDO_CMD_RESET |
+                              NI_M_CDI_CMD_RESET,
                          NI_M_CDIO_CMD_REG);
                ni_writel(dev, s->io_bits, NI_M_DIO_DIR_REG);
        } else {

diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index 2f0f94d..35caf8e 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -1057,6 +1057,26 @@ static const struct comedi_lrange range_ni_E_ao_ext;
 #define NI_M_CDIO_STATUS_CDO_FIFO_FULL BIT(1)
 #define NI_M_CDIO_STATUS_CDO_FIFO_EMPTY        BIT(0)
 #define NI_M_CDIO_CMD_REG              0x224
+#define NI_M_CDI_CMD_SW_UPDATE         BIT(20)
+#define NI_M_CDO_CMD_SW_UPDATE         BIT(19)
+#define NI_M_CDO_CMD_F_E_INT_ENA_CLR   BIT(17)
+#define NI_M_CDO_CMD_F_E_INT_ENA_SET   BIT(16)
+#define NI_M_CDI_CMD_ERR_INT_CONFIRM   BIT(15)
+#define NI_M_CDO_CMD_ERR_INT_CONFIRM   BIT(14)
+#define NI_M_CDI_CMD_F_REQ_INT_ENA_CLR BIT(13)
+#define NI_M_CDI_CMD_F_REQ_INT_ENA_SET BIT(12)
+#define NI_M_CDO_CMD_F_REQ_INT_ENA_CLR BIT(11)
+#define NI_M_CDO_CMD_F_REQ_INT_ENA_SET BIT(10)
+#define NI_M_CDI_CMD_ERR_INT_ENA_CLR   BIT(9)
+#define NI_M_CDI_CMD_ERR_INT_ENA_SET   BIT(8)
+#define NI_M_CDO_CMD_ERR_INT_ENA_CLR   BIT(7)
+#define NI_M_CDO_CMD_ERR_INT_ENA_SET   BIT(6)
+#define NI_M_CDI_CMD_RESET             BIT(5)
+#define NI_M_CDO_CMD_RESET             BIT(4)
+#define NI_M_CDI_CMD_ARM               BIT(3)
+#define NI_M_CDI_CMD_DISARM            BIT(2)
+#define NI_M_CDO_CMD_ARM               BIT(1)
+#define NI_M_CDO_CMD_DISARM            BIT(0)
 #define NI_M_CDI_MODE_REG              0x228
 #define NI_M_CDO_MODE_REG              0x22c
 #define NI_M_CDI_MASK_ENA_REG          0x230
@@ -1065,29 +1085,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 CDIO_Command_Bits {
-       CDO_Disarm_Bit = 0x1,
-       CDO_Arm_Bit = 0x2,
-       CDI_Disarm_Bit = 0x4,
-       CDI_Arm_Bit = 0x8,
-       CDO_Reset_Bit = 0x10,
-       CDI_Reset_Bit = 0x20,
-       CDO_Error_Interrupt_Enable_Set_Bit = 0x40,
-       CDO_Error_Interrupt_Enable_Clear_Bit = 0x80,
-       CDI_Error_Interrupt_Enable_Set_Bit = 0x100,
-       CDI_Error_Interrupt_Enable_Clear_Bit = 0x200,
-       CDO_FIFO_Request_Interrupt_Enable_Set_Bit = 0x400,
-       CDO_FIFO_Request_Interrupt_Enable_Clear_Bit = 0x800,
-       CDI_FIFO_Request_Interrupt_Enable_Set_Bit = 0x1000,
-       CDI_FIFO_Request_Interrupt_Enable_Clear_Bit = 0x2000,
-       CDO_Error_Interrupt_Confirm_Bit = 0x4000,
-       CDI_Error_Interrupt_Confirm_Bit = 0x8000,
-       CDO_Empty_FIFO_Interrupt_Enable_Set_Bit = 0x10000,
-       CDO_Empty_FIFO_Interrupt_Enable_Clear_Bit = 0x20000,
-       CDO_SW_Update_Bit = 0x80000,
-       CDI_SW_Update_Bit = 0x100000
-};
-
 enum CDI_Mode_Bits {
        CDI_Sample_Source_Select_Mask = 0x3f,
        CDI_Halt_On_Error_Bit = 0x200,