Commit 2c81ab43 authored by Ravishankar Karkala Mallikarjunayya's avatar Ravishankar Karkala Mallikarjunayya Committed by Greg Kroah-Hartman

Staging: comedi: fix BIT macro issue in das6402.c

This patch Replace all occurences of (1<<x) by BIT(x) and DAS6402_CTRL_TRIG(x),
DAS6402_MODE_RANGE(x), DAS6402_MODE_DMA(x) macros in the file das6402.c
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 86c7815e
...@@ -50,48 +50,50 @@ ...@@ -50,48 +50,50 @@
#define DAS6402_AO_LSB_REG(x) (0x04 + ((x) * 2)) #define DAS6402_AO_LSB_REG(x) (0x04 + ((x) * 2))
#define DAS6402_AO_MSB_REG(x) (0x05 + ((x) * 2)) #define DAS6402_AO_MSB_REG(x) (0x05 + ((x) * 2))
#define DAS6402_STATUS_REG 0x08 #define DAS6402_STATUS_REG 0x08
#define DAS6402_STATUS_FFNE (1 << 0) #define DAS6402_STATUS_FFNE BIT(0)
#define DAS6402_STATUS_FHALF (1 << 1) #define DAS6402_STATUS_FHALF BIT(1)
#define DAS6402_STATUS_FFULL (1 << 2) #define DAS6402_STATUS_FFULL BIT(2)
#define DAS6402_STATUS_XINT (1 << 3) #define DAS6402_STATUS_XINT BIT(3)
#define DAS6402_STATUS_INT (1 << 4) #define DAS6402_STATUS_INT BIT(4)
#define DAS6402_STATUS_XTRIG (1 << 5) #define DAS6402_STATUS_XTRIG BIT(5)
#define DAS6402_STATUS_INDGT (1 << 6) #define DAS6402_STATUS_INDGT BIT(6)
#define DAS6402_STATUS_10MHZ (1 << 7) #define DAS6402_STATUS_10MHZ BIT(7)
#define DAS6402_STATUS_W_CLRINT (1 << 0) #define DAS6402_STATUS_W_CLRINT BIT(0)
#define DAS6402_STATUS_W_CLRXTR (1 << 1) #define DAS6402_STATUS_W_CLRXTR BIT(1)
#define DAS6402_STATUS_W_CLRXIN (1 << 2) #define DAS6402_STATUS_W_CLRXIN BIT(2)
#define DAS6402_STATUS_W_EXTEND (1 << 4) #define DAS6402_STATUS_W_EXTEND BIT(4)
#define DAS6402_STATUS_W_ARMED (1 << 5) #define DAS6402_STATUS_W_ARMED BIT(5)
#define DAS6402_STATUS_W_POSTMODE (1 << 6) #define DAS6402_STATUS_W_POSTMODE BIT(6)
#define DAS6402_STATUS_W_10MHZ (1 << 7) #define DAS6402_STATUS_W_10MHZ BIT(7)
#define DAS6402_CTRL_REG 0x09 #define DAS6402_CTRL_REG 0x09
#define DAS6402_CTRL_SOFT_TRIG (0 << 0) #define DAS6402_CTRL_TRIG(x) ((x) << 0)
#define DAS6402_CTRL_EXT_FALL_TRIG (1 << 0) #define DAS6402_CTRL_SOFT_TRIG DAS6402_CTRL_TRIG(0)
#define DAS6402_CTRL_EXT_RISE_TRIG (2 << 0) #define DAS6402_CTRL_EXT_FALL_TRIG DAS6402_CTRL_TRIG(1)
#define DAS6402_CTRL_PACER_TRIG (3 << 0) #define DAS6402_CTRL_EXT_RISE_TRIG DAS6402_CTRL_TRIG(2)
#define DAS6402_CTRL_BURSTEN (1 << 2) #define DAS6402_CTRL_PACER_TRIG DAS6402_CTRL_TRIG(3)
#define DAS6402_CTRL_XINTE (1 << 3) #define DAS6402_CTRL_BURSTEN BIT(2)
#define DAS6402_CTRL_XINTE BIT(3)
#define DAS6402_CTRL_IRQ(x) ((x) << 4) #define DAS6402_CTRL_IRQ(x) ((x) << 4)
#define DAS6402_CTRL_INTE (1 << 7) #define DAS6402_CTRL_INTE BIT(7)
#define DAS6402_TRIG_REG 0x0a #define DAS6402_TRIG_REG 0x0a
#define DAS6402_TRIG_TGEN (1 << 0) #define DAS6402_TRIG_TGEN BIT(0)
#define DAS6402_TRIG_TGSEL (1 << 1) #define DAS6402_TRIG_TGSEL BIT(1)
#define DAS6402_TRIG_TGPOL (1 << 2) #define DAS6402_TRIG_TGPOL BIT(2)
#define DAS6402_TRIG_PRETRIG (1 << 3) #define DAS6402_TRIG_PRETRIG BIT(3)
#define DAS6402_AO_RANGE(_chan, _range) ((_range) << ((_chan) ? 6 : 4)) #define DAS6402_AO_RANGE(_chan, _range) ((_range) << ((_chan) ? 6 : 4))
#define DAS6402_AO_RANGE_MASK(_chan) (3 << ((_chan) ? 6 : 4)) #define DAS6402_AO_RANGE_MASK(_chan) (3 << ((_chan) ? 6 : 4))
#define DAS6402_MODE_REG 0x0b #define DAS6402_MODE_REG 0x0b
#define DAS6402_MODE_RANGE(x) ((x) << 0) #define DAS6402_MODE_RANGE(x) ((x) << 2)
#define DAS6402_MODE_POLLED (0 << 2) #define DAS6402_MODE_POLLED DAS6402_MODE_RANGE(0)
#define DAS6402_MODE_FIFONEPTY (1 << 2) #define DAS6402_MODE_FIFONEPTY DAS6402_MODE_RANGE(1)
#define DAS6402_MODE_FIFOHFULL (2 << 2) #define DAS6402_MODE_FIFOHFULL DAS6402_MODE_RANGE(2)
#define DAS6402_MODE_EOB (3 << 2) #define DAS6402_MODE_EOB DAS6402_MODE_RANGE(3)
#define DAS6402_MODE_ENHANCED (1 << 4) #define DAS6402_MODE_ENHANCED BIT(4)
#define DAS6402_MODE_SE (1 << 5) #define DAS6402_MODE_SE BIT(5)
#define DAS6402_MODE_UNI (1 << 6) #define DAS6402_MODE_UNI BIT(6)
#define DAS6402_MODE_DMA1 (0 << 7) #define DAS6402_MODE_DMA(x) ((x) << 7)
#define DAS6402_MODE_DMA3 (1 << 7) #define DAS6402_MODE_DMA1 DAS6402_MODE_DMA(0)
#define DAS6402_MODE_DMA3 DAS6402_MODE_DMA(1)
#define DAS6402_TIMER_BASE 0x0c #define DAS6402_TIMER_BASE 0x0c
static const struct comedi_lrange das6402_ai_ranges = { static const struct comedi_lrange das6402_ai_ranges = {
......
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