Skip to content

L
linux
Commit d9b9c9a0 authored by Ravishankar Karkala Mallikarjunayya's avatar Ravishankar Karkala Mallikarjunayya Committed by Greg Kroah-Hartman
Browse files
Options

Staging: comedi: dmm32at: fix BIT macro issue. 

This Replace all occurences of (1<<x) by BIT(x) and DMM32AT_CTRL_PAGE(x),
DMM32AT_AI_CFG_SCINT(x) macros to get rid of checkpatch.pl
"CHECK" output "Prefer using the BIT macro"
Signed-off-by: default avatarRavishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5efe1159
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 48 deletions
drivers/staging/comedi/drivers/dmm32at.c
View file @ d9b9c9a0
......@@ -46,73 +46,75 @@
#define DMM32AT_AI_START_CONV_REG 0x00
#define DMM32AT_AI_LSB_REG 0x00
#define DMM32AT_AUX_DOUT_REG 0x01
#define DMM32AT_AUX_DOUT2 (1 << 2) /* J3.42 - OUT2 (OUT2EN) */
#define DMM32AT_AUX_DOUT1 (1 << 1) /* J3.43 */
#define DMM32AT_AUX_DOUT0 (1 << 0) /* J3.44 - OUT0 (OUT0EN) */
#define DMM32AT_AUX_DOUT2 BIT(2) /* J3.42 - OUT2 (OUT2EN) */
#define DMM32AT_AUX_DOUT1 BIT(1) /* J3.43 */
#define DMM32AT_AUX_DOUT0 BIT(0) /* J3.44 - OUT0 (OUT0EN) */
#define DMM32AT_AI_MSB_REG 0x01
#define DMM32AT_AI_LO_CHAN_REG 0x02
#define DMM32AT_AI_HI_CHAN_REG 0x03
#define DMM32AT_AUX_DI_REG 0x04
#define DMM32AT_AUX_DI_DACBUSY (1 << 7)
#define DMM32AT_AUX_DI_CALBUSY (1 << 6)
#define DMM32AT_AUX_DI3 (1 << 3) /* J3.45 - ADCLK (CLKSEL) */
#define DMM32AT_AUX_DI2 (1 << 2) /* J3.46 - GATE12 (GT12EN) */
#define DMM32AT_AUX_DI1 (1 << 1) /* J3.47 - GATE0 (GT0EN) */
#define DMM32AT_AUX_DI0 (1 << 0) /* J3.48 - CLK0 (SRC0) */
#define DMM32AT_AUX_DI_DACBUSY BIT(7)
#define DMM32AT_AUX_DI_CALBUSY BIT(6)
#define DMM32AT_AUX_DI3 BIT(3) /* J3.45 - ADCLK (CLKSEL) */
#define DMM32AT_AUX_DI2 BIT(2) /* J3.46 - GATE12 (GT12EN) */
#define DMM32AT_AUX_DI1 BIT(1) /* J3.47 - GATE0 (GT0EN) */
#define DMM32AT_AUX_DI0 BIT(0) /* J3.48 - CLK0 (SRC0) */
#define DMM32AT_AO_LSB_REG 0x04
#define DMM32AT_AO_MSB_REG 0x05
#define DMM32AT_AO_MSB_DACH(x) ((x) << 6)
#define DMM32AT_FIFO_DEPTH_REG 0x06
#define DMM32AT_FIFO_CTRL_REG 0x07
#define DMM32AT_FIFO_CTRL_FIFOEN (1 << 3)
#define DMM32AT_FIFO_CTRL_SCANEN (1 << 2)
#define DMM32AT_FIFO_CTRL_FIFORST (1 << 1)
#define DMM32AT_FIFO_CTRL_FIFOEN BIT(3)
#define DMM32AT_FIFO_CTRL_SCANEN BIT(2)
#define DMM32AT_FIFO_CTRL_FIFORST BIT(1)
#define DMM32AT_FIFO_STATUS_REG 0x07
#define DMM32AT_FIFO_STATUS_EF (1 << 7)
#define DMM32AT_FIFO_STATUS_HF (1 << 6)
#define DMM32AT_FIFO_STATUS_FF (1 << 5)
#define DMM32AT_FIFO_STATUS_OVF (1 << 4)
#define DMM32AT_FIFO_STATUS_FIFOEN (1 << 3)
#define DMM32AT_FIFO_STATUS_SCANEN (1 << 2)
#define DMM32AT_FIFO_STATUS_EF BIT(7)
#define DMM32AT_FIFO_STATUS_HF BIT(6)
#define DMM32AT_FIFO_STATUS_FF BIT(5)
#define DMM32AT_FIFO_STATUS_OVF BIT(4)
#define DMM32AT_FIFO_STATUS_FIFOEN BIT(3)
#define DMM32AT_FIFO_STATUS_SCANEN BIT(2)
#define DMM32AT_FIFO_STATUS_PAGE_MASK (3 << 0)
#define DMM32AT_CTRL_REG 0x08
#define DMM32AT_CTRL_RESETA (1 << 5)
#define DMM32AT_CTRL_RESETD (1 << 4)
#define DMM32AT_CTRL_INTRST (1 << 3)
#define DMM32AT_CTRL_PAGE_8254 (0 << 0)
#define DMM32AT_CTRL_PAGE_8255 (1 << 0)
#define DMM32AT_CTRL_PAGE_CALIB (3 << 0)
#define DMM32AT_CTRL_RESETA BIT(5)
#define DMM32AT_CTRL_RESETD BIT(4)
#define DMM32AT_CTRL_INTRST BIT(3)
#define DMM32AT_CTRL_PAGE(x) ((x) << 0)
#define DMM32AT_CTRL_PAGE_8254 DMM32AT_CTRL_PAGE(0)
#define DMM32AT_CTRL_PAGE_8255 DMM32AT_CTRL_PAGE(1)
#define DMM32AT_CTRL_PAGE_CALIB DMM32AT_CTRL_PAGE(3)
#define DMM32AT_AI_STATUS_REG 0x08
#define DMM32AT_AI_STATUS_STS (1 << 7)
#define DMM32AT_AI_STATUS_SD1 (1 << 6)
#define DMM32AT_AI_STATUS_SD0 (1 << 5)
#define DMM32AT_AI_STATUS_STS BIT(7)
#define DMM32AT_AI_STATUS_SD1 BIT(6)
#define DMM32AT_AI_STATUS_SD0 BIT(5)
#define DMM32AT_AI_STATUS_ADCH_MASK (0x1f << 0)
#define DMM32AT_INTCLK_REG 0x09
#define DMM32AT_INTCLK_ADINT (1 << 7)
#define DMM32AT_INTCLK_DINT (1 << 6)
#define DMM32AT_INTCLK_TINT (1 << 5)
#define DMM32AT_INTCLK_CLKEN (1 << 1) /* 1=see below 0=software */
#define DMM32AT_INTCLK_CLKSEL (1 << 0) /* 1=OUT2 0=EXTCLK */
#define DMM32AT_INTCLK_ADINT BIT(7)
#define DMM32AT_INTCLK_DINT BIT(6)
#define DMM32AT_INTCLK_TINT BIT(5)
#define DMM32AT_INTCLK_CLKEN BIT(1) /* 1=see below 0=software */
#define DMM32AT_INTCLK_CLKSEL BIT(0) /* 1=OUT2 0=EXTCLK */
#define DMM32AT_CTRDIO_CFG_REG 0x0a
#define DMM32AT_CTRDIO_CFG_FREQ12 (1 << 7) /* CLK12 1=100KHz 0=10MHz */
#define DMM32AT_CTRDIO_CFG_FREQ0 (1 << 6) /* CLK0 1=10KHz 0=10MHz */
#define DMM32AT_CTRDIO_CFG_OUT2EN (1 << 5) /* J3.42 1=OUT2 is DOUT2 */
#define DMM32AT_CTRDIO_CFG_OUT0EN (1 << 4) /* J3,44 1=OUT0 is DOUT0 */
#define DMM32AT_CTRDIO_CFG_GT0EN (1 << 2) /* J3.47 1=DIN1 is GATE0 */
#define DMM32AT_CTRDIO_CFG_SRC0 (1 << 1) /* CLK0 is 0=FREQ0 1=J3.48 */
#define DMM32AT_CTRDIO_CFG_GT12EN (1 << 0) /* J3.46 1=DIN2 is GATE12 */
#define DMM32AT_CTRDIO_CFG_FREQ12 BIT(7) /* CLK12 1=100KHz 0=10MHz */
#define DMM32AT_CTRDIO_CFG_FREQ0 BIT(6) /* CLK0 1=10KHz 0=10MHz */
#define DMM32AT_CTRDIO_CFG_OUT2EN BIT(5) /* J3.42 1=OUT2 is DOUT2 */
#define DMM32AT_CTRDIO_CFG_OUT0EN BIT(4) /* J3,44 1=OUT0 is DOUT0 */
#define DMM32AT_CTRDIO_CFG_GT0EN BIT(2) /* J3.47 1=DIN1 is GATE0 */
#define DMM32AT_CTRDIO_CFG_SRC0 BIT(1) /* CLK0 is 0=FREQ0 1=J3.48 */
#define DMM32AT_CTRDIO_CFG_GT12EN BIT(0) /* J3.46 1=DIN2 is GATE12 */
#define DMM32AT_AI_CFG_REG 0x0b
#define DMM32AT_AI_CFG_SCINT_20US (0 << 4)
#define DMM32AT_AI_CFG_SCINT_15US (1 << 4)
#define DMM32AT_AI_CFG_SCINT_10US (2 << 4)
#define DMM32AT_AI_CFG_SCINT_5US (3 << 4)
#define DMM32AT_AI_CFG_RANGE (1 << 3) /* 0=5V 1=10V */
#define DMM32AT_AI_CFG_ADBU (1 << 2) /* 0=bipolar 1=unipolar */
#define DMM32AT_AI_CFG_SCINT(x) ((x) << 4)
#define DMM32AT_AI_CFG_SCINT_20US DMM32AT_AI_CFG_SCINT(0)
#define DMM32AT_AI_CFG_SCINT_15US DMM32AT_AI_CFG_SCINT(1)
#define DMM32AT_AI_CFG_SCINT_10US DMM32AT_AI_CFG_SCINT(2)
#define DMM32AT_AI_CFG_SCINT_5US DMM32AT_AI_CFG_SCINT(3)
#define DMM32AT_AI_CFG_RANGE BIT(3) /* 0=5V 1=10V */
#define DMM32AT_AI_CFG_ADBU BIT(2) /* 0=bipolar 1=unipolar */
#define DMM32AT_AI_CFG_GAIN(x) ((x) << 0)
#define DMM32AT_AI_READBACK_REG 0x0b
#define DMM32AT_AI_READBACK_WAIT (1 << 7) /* DMM32AT_AI_STATUS_STS */
#define DMM32AT_AI_READBACK_RANGE (1 << 3)
#define DMM32AT_AI_READBACK_ADBU (1 << 2)
#define DMM32AT_AI_READBACK_WAIT BIT(7) /* DMM32AT_AI_STATUS_STS */
#define DMM32AT_AI_READBACK_RANGE BIT(3)
#define DMM32AT_AI_READBACK_ADBU BIT(2)
#define DMM32AT_AI_READBACK_GAIN_MASK (3 << 0)
#define DMM32AT_CLK1 0x0d
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7