]> git.karo-electronics.de Git - linux-beck.git/log
linux-beck.git
9 years agostaging: remove i2o subsystem
Greg Kroah-Hartman [Sun, 10 May 2015 12:54:38 +0000 (14:54 +0200)]
staging: remove i2o subsystem

This subsystem isn't used anymore, and the hardware isn't around.  It's
been in staging for a while, and it's time for it to now be removed.

Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: comedi: ni_stc.h: final cleanup
H Hartley Sweeten [Fri, 1 May 2015 22:00:12 +0000 (15:00 -0700)]
staging: comedi: ni_stc.h: final cleanup

1) Move the enum's to a better location and tidy up the whitespace.
2) Tidy up the defines used for some array sizes in the private data.
3) Add comments for the spinlock_t variables in the private data.
4) Move the forward declaration to the end of the file.

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>
9 years agostaging: comedi: ni_stc.h: tidy up the windowed_regs_67xx_61xx
H Hartley Sweeten [Fri, 1 May 2015 22:00:11 +0000 (15:00 -0700)]
staging: comedi: ni_stc.h: tidy up the windowed_regs_67xx_61xx

Rename the CamelCase. For aesthetics, convert the enum 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>
9 years agostaging: comedi: ni_stc.h: tidy up the cs5529_command_bits
H Hartley Sweeten [Fri, 1 May 2015 22:00:10 +0000 (15:00 -0700)]
staging: comedi: ni_stc.h: tidy up the cs5529_command_bits

For aesthetics, convert the enum 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>
9 years agostaging: comedi: ni_stc.h: tidy up the cs5529_configuration_bits
H Hartley Sweeten [Fri, 1 May 2015 22:00:09 +0000 (15:00 -0700)]
staging: comedi: ni_stc.h: tidy up the cs5529_configuration_bits

For aesthetics, convert the enum into defines and the inline functions
into macros. 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>
9 years agostaging: comedi: ni_stc.h: rename the NI-6143 register defines
H Hartley Sweeten [Fri, 1 May 2015 22:00:08 +0000 (15:00 -0700)]
staging: comedi: ni_stc.h: rename the NI-6143 register defines

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: rename the NI-611x register defines
H Hartley Sweeten [Fri, 1 May 2015 22:00:07 +0000 (15:00 -0700)]
staging: comedi: ni_stc.h: rename the NI-611x register defines

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: remove unused _bit* defines
H Hartley Sweeten [Fri, 1 May 2015 22:00:06 +0000 (15:00 -0700)]
staging: comedi: ni_stc.h: remove unused _bit* defines

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>
9 years agostaging: comedi: ni_mio_common: move ni_stc_dma_channel_select_bitfield()
H Hartley Sweeten [Fri, 1 May 2015 22:00:05 +0000 (15:00 -0700)]
staging: comedi: ni_mio_common: move ni_stc_dma_channel_select_bitfield()

Move this inline helper function from ni_stc.h. It does not need to be
exposed outside of this file.

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>
9 years agostaging: comedi: ni_stc.h: tidy up G0_G1_Select register and bits
H Hartley Sweeten [Fri, 1 May 2015 22:00:04 +0000 (15:00 -0700)]
staging: comedi: ni_stc.h: tidy up G0_G1_Select register and bits

Rename the CamelCase. Convert the inline helper functions into macros.

Tidy up the driver code to use the new macros. For consistency, make
the ni_set_gpct_dma_channel() helper follow the same style as the
ni_set_ai_dma_channel() and ni_set_ao_dma_channel() helpers.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_AO_Select register and bits
H Hartley Sweeten [Fri, 1 May 2015 22:00:03 +0000 (15:00 -0700)]
staging: comedi: ni_stc.h: tidy up AI_AO_Select register and bits

Rename the CamelCase and convert the enum into macros.

Tidy up the driver code to use the new macros.

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>
9 years agostaging: comedi: ni_mio_common: remove BUG_ON(gpct_index ...) checks
H Hartley Sweeten [Fri, 1 May 2015 22:00:02 +0000 (15:00 -0700)]
staging: comedi: ni_mio_common: remove BUG_ON(gpct_index ...) checks

The gpct_index will always be 0 or 1. Remove the unnecessary BUG_ON()
checks.

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>
9 years agostaging: comedi: ni_stc.h: tidy up DAC[01]_Direct_Data registers
H Hartley Sweeten [Fri, 1 May 2015 22:00:01 +0000 (15:00 -0700)]
staging: comedi: ni_stc.h: tidy up DAC[01]_Direct_Data registers

Rename the CamelCase and convert the defines into a macro.

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>
9 years agostaging: comedi: ni_stc.h: tidy up DAC_FIFO_Data register
H Hartley Sweeten [Fri, 1 May 2015 22:00:00 +0000 (15:00 -0700)]
staging: comedi: ni_stc.h: tidy up DAC_FIFO_Data register

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_Configuration register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:59 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AO_Configuration register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up Configuration_Memory_High register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:58 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Configuration_Memory_High register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up Configuration_Memory_Low register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:57 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Configuration_Memory_Low register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up ADC_FIFO_Data_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:56 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up ADC_FIFO_Data_Register

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up 8255 register defines
H Hartley Sweeten [Fri, 1 May 2015 21:59:55 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up 8255 register defines

Only the 'Port_A' define is used. Rename the CamelCase and remove the
unused defines.

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>
9 years agostaging: comedi: ni_stc.h: tidy up Misc_Command register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:54 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Misc_Command register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up Serial_Command register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:53 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Serial_Command register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up XXX_Status register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:52 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up XXX_Status register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up Window_{Address,Data} defines
H Hartley Sweeten [Fri, 1 May 2015 21:59:51 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Window_{Address,Data} defines

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: remove unused GPCT register bit defines
H Hartley Sweeten [Fri, 1 May 2015 21:59:50 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: remove unused GPCT register bit defines

The bit defines in this header for the GPCT registers are not used. The ones
in ni_tio_internal.h are used instead. Remove them from this header.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_*_Save_Registers
H Hartley Sweeten [Fri, 1 May 2015 21:59:49 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AI_*_Save_Registers

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up Joint_Status_2_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:48 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Joint_Status_2_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up DIO_Serial_Input_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:47 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up DIO_Serial_Input_Register

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up Joint_Status_1_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:46 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Joint_Status_1_Register

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_*_Save_Registers
H Hartley Sweeten [Fri, 1 May 2015 21:59:45 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AO_*_Save_Registers

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up G_Save_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:44 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up G_Save_Register

Rename the CamelCase and define the G0 and G1 registers to add clarity
to the mio_regmap tables.

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>
9 years agostaging: comedi: ni_stc.h: tidy up G_HW_Save_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:43 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up G_HW_Save_Register

Rename the CamelCase and define the G0 and G1 registers to add clarity
to the mio_regmap tables.

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>
9 years agostaging: comedi: ni_stc.h: tidy up DIO_Parallel_Input_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:42 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up DIO_Parallel_Input_Register

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_Status_2_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:41 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AO_Status_2_Register

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_Status_2_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:40 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AI_Status_2_Register

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up G_Status_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:39 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up G_Status_Register

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_Status_1_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:38 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AO_Status_1_Register and bits

Rename the CamelCase. Use the BIT() marco 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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_Status_1_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:37 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AI_Status_1_Register and bits

Rename the CamelCase. Use the BIT() marco 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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_Mode_3_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:36 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AI_Mode_3_Register and bits

Rename the CamelCase. Use the BIT() marco 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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_Output_Control_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:35 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AO_Output_Control_Register and bits

Rename the CamelCase. Convert the inline helper function into a macro and
use the BIT() marco 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>
9 years agostaging: comedi: ni_stc.h: tidy up Write_Strobe_*_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:34 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Write_Strobe_*_Register

The Write_Strobe_*_Register defines are noy used. Instead the more
descriptive Configuration_Memory_Clear, ADC_FIFO_Clear and DAC_FIFO_Clear
defines are used. Remove the unused defines and rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up RTSI_Board_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:33 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up RTSI_Board_Register

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up RTSI_Trig_[AB]_Output_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:32 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up RTSI_Trig_[AB]_Output_Register and bits

Rename the CamelCase. Convert the inline helper functions to macros and 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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_Personal_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:31 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AO_Personal_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_Personal_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:30 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AI_Personal_Register and bits

Rename the CamelCase. Use the BIT() macro to define the bits.

Tidy up ni_ai_reset() by using a local var to set the common bits and
programming the register in the common code path.

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>
9 years agostaging: comedi: ni_stc.h: tidy up Second_IRQ_B_Enable_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:29 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Second_IRQ_B_Enable_Register and bits

Rename the CamelCase. The bit defines are identical to NISTC_INTB_ENA_REG.
Reuse them.

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>
9 years agostaging: comedi: ni_stc.h: tidy up Interrupt_B_Enable_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:28 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Interrupt_B_Enable_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up Second_IRQ_A_Enable_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:27 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Second_IRQ_A_Enable_Register and bits

Rename the CamelCase. The bit defines are identical to NISTC_INTA_ENA_REG.
Reuse them.

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>
9 years agostaging: comedi: ni_stc.h: tidy up Interrupt_A_Enable_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:26 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Interrupt_A_Enable_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up Joint_Reset_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:25 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Joint_Reset_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_Mode_3_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:24 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AO_Mode_3_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up G_Autoincrement_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:23 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up G_Autoincrement_Register

Rename the CamelCase and define the G0 and G1 registers to add clarity
to the mio_regmap tables.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_Trigger_Select_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:22 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AO_Trigger_Select_Register and bits

Rename the CamelCase. Use the BIT() macro to define the bits.

Tidy up the ni_ao_cmd() by using a local var to mask/set the bits then
programming the register in the common code path.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_Start_Select_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:21 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AO_Start_Select_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_DIV_Load_A_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:20 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AI_DIV_Load_A_Register

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_Trigger_Select_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:19 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AI_Trigger_Select_Register and bits

Rename the CamelCase. Use the BIT() macro to define the bits.

Tidy up ni_ai_cmd() by using a local var to set the common bits and
programming the register in the common code path.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_START_STOP_Select_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:18 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AI_START_STOP_Select_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up Analog_Trigger_Etc_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:17 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Analog_Trigger_Etc_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_Output_Control_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:16 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AI_Output_Control_Register and bits

Rename the CamelCase. Use the BIT() macro to define the bits.

Tidy up the programming of this register un ni_ai_reset() by using a
local variable to set the common bits then writing the register in the
common code path.

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>
9 years agostaging: comedi: ni_stc.h: tidy up Interrupt_Control_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:15 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Interrupt_Control_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up RTSI_Trig_Direction_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:14 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up RTSI_Trig_Direction_Register and bits

Rename the CamelCase and convert the enum and inline function 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>
9 years agostaging: comedi: ni_stc.h: remove unreachable code in RTSI_Output_Bit()
H Hartley Sweeten [Fri, 1 May 2015 21:59:13 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: remove unreachable code in RTSI_Output_Bit()

All the callers of this function check the 'channel' number with
num_configurable_rtsi_channels(). This check can never occure.
Remove it.

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>
9 years agostaging: comedi: ni_stc.h: tidy up IO_Bidirection_Pin_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:12 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up IO_Bidirection_Pin_Register

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_mio_common: use 'reg' in ni_set_bitfield()
H Hartley Sweeten [Fri, 1 May 2015 21:59:11 +0000 (14:59 -0700)]
staging: comedi: ni_mio_common: use 'reg' in ni_set_bitfield()

Use the passed 'reg' parameter to write to the STC registers instead
of duplicating the case symbol.

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>
9 years agostaging: comedi: ni_stc.h: tidy up Clock_and_FOUT_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:10 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up Clock_and_FOUT_Register and bits

Rename the CamelCase and convert the enum and inline function 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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_*_Load_[AB]_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:09 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AO_*_Load_[AB]_Register

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_Mode_2_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:08 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AO_Mode_2_Register and bits

Rename the CamelCase and convert the enum 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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_Mode_1_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:07 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AO_Mode_1_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up G_{Mode,Load,Input}*_Register
H Hartley Sweeten [Fri, 1 May 2015 21:59:06 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up G_{Mode,Load,Input}*_Register

Rename the CamelCase and define he G0 and G1 registers to add clarity
to the mio_regmap tables.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_*_Load_[AB]_Registers
H Hartley Sweeten [Fri, 1 May 2015 21:59:05 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AI_*_Load_[AB]_Registers

Rename the CamelCase.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_Mode_2_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:04 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AI_Mode_2_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_Mode_1_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:03 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AI_Mode_1_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up DIO_Control_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:02 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up DIO_Control_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up DIO_Output_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:01 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up DIO_Output_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_Command_1_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:59:00 +0000 (14:59 -0700)]
staging: comedi: ni_stc.h: tidy up AO_Command_1_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_Command_1_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:59 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up AI_Command_1_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up G_Command_Register
H Hartley Sweeten [Fri, 1 May 2015 21:58:58 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up G_Command_Register

Rename the CamelCase and define the G0 and G1 registers to add clarity
to the mio_regmap tables.

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>
9 years agostaging: comedi: ni_stc.h: tidy up AO_Command_2_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:57 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up AO_Command_2_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up AI_Command_2_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:56 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up AI_Command_2_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up Interrupt_B_Ack_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:55 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up Interrupt_B_Ack_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_stc.h: tidy up Interrupt_A_Ack_Register and bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:54 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up Interrupt_A_Ack_Register and bits

Rename the CamelCase. 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>
9 years agostaging: comedi: ni_mio_common: remove disabled GPCT functions
H Hartley Sweeten [Fri, 1 May 2015 21:58:53 +0000 (14:58 -0700)]
staging: comedi: ni_mio_common: remove disabled GPCT functions

The GPCT (general purpose counter timer) is handled by the ni_tio and
ni_tiocmd modules. Remove the old disabled code in this file.

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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_INTC_STATUS_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:52 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_INTC_STATUS_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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_INTC_ENA_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:51 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_INTC_ENA_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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_CDO_MODE_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:50 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_CDO_MODE_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>
9 years agostaging: comedi: ni_mio_common: remove BUG() check in ni_cdio_cmd()
H Hartley Sweeten [Fri, 1 May 2015 21:58:49 +0000 (14:58 -0700)]
staging: comedi: ni_mio_common: remove BUG() check in ni_cdio_cmd()

The cmd->scan_begin_src was validated in ni_cdio_cmdtest() and can only
be TRIG_EXT. Remove the switch statement and unnecessary BUG() check.

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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_CDI_MODE_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:48 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_CDI_MODE_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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_CDIO_CMD_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:47 +0000 (14:58 -0700)]
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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_CDIO_STATUS_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:46 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_CDIO_STATUS_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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_CDIO_DMA_SEL_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:45 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_CDIO_DMA_SEL_REG bits

Rename the CamelCase and convert enums into macros to set the
bits in this register.

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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_PFI_FILTER_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:44 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_PFI_FILTER_REG bits

Rename the CamelCase and convert the inline helper functions
that set the bits in this register to macros.

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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_PFI_OUT_SEL_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:43 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_PFI_OUT_SEL_REG bits

Rename the CamelCase and convert the inline helper functions
that set/get the bits in this register to macros.

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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_CAL_PWM_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:42 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_CAL_PWM_REG bits

Rename the CamelCase and convert the inline helper functions
that set the bits in this register to macros.

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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_AO_REF_ATTENUATION_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:41 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_AO_REF_ATTENUATION_REG bits

Rename the CamelCase and convert the enum 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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_AO_CFG_BANK_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:40 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_AO_CFG_BANK_REG bits

Rename the CamelCase and convert the enum 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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_AI_CFG_BYPASS_FIFO_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:39 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_AI_CFG_BYPASS_FIFO_REG bits

Rename the CamelCase and convert the enum into defines. Use the BIT()
macro to define the bits. Convert the inline helper functions into
macros.

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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_PLL_STATUS_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:38 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_PLL_STATUS_REG bits

Rename the CamelCase and convert the enum 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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_PLL_CTRL_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:37 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_PLL_CTRL_REG bits

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

Convert the inline functions MSeries_PLL_Divisor_Bits() and
MSeries_PLL_Multiplier_Bits() to macros. The helper function
ni_mseries_get_pll_parameters() always returns valid values for the
'divisor' and 'multiplier' so the sanity checking can safely be
removed.

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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_CLK_FOUT2_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:36 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_CLK_FOUT2_REG bits

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

Convert the inline function MSeries_PLL_In_Source_Select_RTSI_Bits()
to a macro. The caller always passes valid values for 'RTIS_channel'
so the sanity checking can safely be removed.

Tidy up ni_mseries_set_pll_master_clock() to remove the unnecessary
extra indent level for the code that sets a RTSI channel for the
PLL source.

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>
9 years agostaging: comedi: ni_stc.h: tidy up NI_M_AI_CFG_FIFO_DATA_REG bits
H Hartley Sweeten [Fri, 1 May 2015 21:58:35 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: tidy up NI_M_AI_CFG_FIFO_DATA_REG bits

Rename all the CamelCase and convert the enum and helper functions
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>
9 years agostaging: comedi: ni_stc.h: rename M_Offset_* symbols
H Hartley Sweeten [Fri, 1 May 2015 21:58:34 +0000 (14:58 -0700)]
staging: comedi: ni_stc.h: rename M_Offset_* symbols

Renamme these CamelCase symbols.

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>