Skip to content

L
linux
Commit 41849215 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Revert "Staging: vme: Use BIT macro for bit field definitions." 

This reverts commit d4ef1313.

It's wrong :(
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Cc: Anton Leshchenko <antonl1911@gmail.com>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
parent d349883f
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 51 deletions
drivers/staging/vme/devices/vme_pio2.h
View file @ 41849215
...@@ -68,38 +68,38 @@ static const int PIO2_CHANNEL_BANK[32] = { 0, 0, 0, 0, 0, 0, 0, 0, ...@@ -68,38 +68,38 @@ static const int PIO2_CHANNEL_BANK[32] = { 0, 0, 0, 0, 0, 0, 0, 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
3, 3, 3, 3, 3, 3, 3, 3 }; 3, 3, 3, 3, 3, 3, 3, 3 };
#define PIO2_CHANNEL0_BIT BIT(0) #define PIO2_CHANNEL0_BIT (1 << 0)
#define PIO2_CHANNEL1_BIT BIT(1) #define PIO2_CHANNEL1_BIT (1 << 1)
#define PIO2_CHANNEL2_BIT BIT(2) #define PIO2_CHANNEL2_BIT (1 << 2)
#define PIO2_CHANNEL3_BIT BIT(3) #define PIO2_CHANNEL3_BIT (1 << 3)
#define PIO2_CHANNEL4_BIT BIT(4) #define PIO2_CHANNEL4_BIT (1 << 4)
#define PIO2_CHANNEL5_BIT BIT(5) #define PIO2_CHANNEL5_BIT (1 << 5)
#define PIO2_CHANNEL6_BIT BIT(6) #define PIO2_CHANNEL6_BIT (1 << 6)
#define PIO2_CHANNEL7_BIT BIT(7) #define PIO2_CHANNEL7_BIT (1 << 7)
#define PIO2_CHANNEL8_BIT BIT(0) #define PIO2_CHANNEL8_BIT (1 << 0)
#define PIO2_CHANNEL9_BIT BIT(1) #define PIO2_CHANNEL9_BIT (1 << 1)
#define PIO2_CHANNEL10_BIT BIT(2) #define PIO2_CHANNEL10_BIT (1 << 2)
#define PIO2_CHANNEL11_BIT BIT(3) #define PIO2_CHANNEL11_BIT (1 << 3)
#define PIO2_CHANNEL12_BIT BIT(4) #define PIO2_CHANNEL12_BIT (1 << 4)
#define PIO2_CHANNEL13_BIT BIT(5) #define PIO2_CHANNEL13_BIT (1 << 5)
#define PIO2_CHANNEL14_BIT BIT(6) #define PIO2_CHANNEL14_BIT (1 << 6)
#define PIO2_CHANNEL15_BIT BIT(7) #define PIO2_CHANNEL15_BIT (1 << 7)
#define PIO2_CHANNEL16_BIT BIT(0) #define PIO2_CHANNEL16_BIT (1 << 0)
#define PIO2_CHANNEL17_BIT BIT(1) #define PIO2_CHANNEL17_BIT (1 << 1)
#define PIO2_CHANNEL18_BIT BIT(2) #define PIO2_CHANNEL18_BIT (1 << 2)
#define PIO2_CHANNEL19_BIT BIT(3) #define PIO2_CHANNEL19_BIT (1 << 3)
#define PIO2_CHANNEL20_BIT BIT(4) #define PIO2_CHANNEL20_BIT (1 << 4)
#define PIO2_CHANNEL21_BIT BIT(5) #define PIO2_CHANNEL21_BIT (1 << 5)
#define PIO2_CHANNEL22_BIT BIT(6) #define PIO2_CHANNEL22_BIT (1 << 6)
#define PIO2_CHANNEL23_BIT BIT(7) #define PIO2_CHANNEL23_BIT (1 << 7)
#define PIO2_CHANNEL24_BIT BIT(0) #define PIO2_CHANNEL24_BIT (1 << 0)
#define PIO2_CHANNEL25_BIT BIT(1) #define PIO2_CHANNEL25_BIT (1 << 1)
#define PIO2_CHANNEL26_BIT BIT(2) #define PIO2_CHANNEL26_BIT (1 << 2)
#define PIO2_CHANNEL27_BIT BIT(3) #define PIO2_CHANNEL27_BIT (1 << 3)
#define PIO2_CHANNEL28_BIT BIT(4) #define PIO2_CHANNEL28_BIT (1 << 4)
#define PIO2_CHANNEL29_BIT BIT(5) #define PIO2_CHANNEL29_BIT (1 << 5)
#define PIO2_CHANNEL30_BIT BIT(6) #define PIO2_CHANNEL30_BIT (1 << 6)
#define PIO2_CHANNEL31_BIT BIT(7) #define PIO2_CHANNEL31_BIT (1 << 7)
static const int PIO2_CHANNEL_BIT[32] = { PIO2_CHANNEL0_BIT, PIO2_CHANNEL1_BIT, static const int PIO2_CHANNEL_BIT[32] = { PIO2_CHANNEL0_BIT, PIO2_CHANNEL1_BIT,
PIO2_CHANNEL2_BIT, PIO2_CHANNEL3_BIT, PIO2_CHANNEL2_BIT, PIO2_CHANNEL3_BIT,
...@@ -120,12 +120,12 @@ static const int PIO2_CHANNEL_BIT[32] = { PIO2_CHANNEL0_BIT, PIO2_CHANNEL1_BIT, ...@@ -120,12 +120,12 @@ static const int PIO2_CHANNEL_BIT[32] = { PIO2_CHANNEL0_BIT, PIO2_CHANNEL1_BIT,
}; };
/* PIO2_REGS_INT_STAT_CNTR (0xc) */ /* PIO2_REGS_INT_STAT_CNTR (0xc) */
#define PIO2_COUNTER0 BIT(0) #define PIO2_COUNTER0 (1 << 0)
#define PIO2_COUNTER1 BIT(1) #define PIO2_COUNTER1 (1 << 1)
#define PIO2_COUNTER2 BIT(2) #define PIO2_COUNTER2 (1 << 2)
#define PIO2_COUNTER3 BIT(3) #define PIO2_COUNTER3 (1 << 3)
#define PIO2_COUNTER4 BIT(4) #define PIO2_COUNTER4 (1 << 4)
#define PIO2_COUNTER5 BIT(5) #define PIO2_COUNTER5 (1 << 5)
static const int PIO2_COUNTER[6] = { PIO2_COUNTER0, PIO2_COUNTER1, static const int PIO2_COUNTER[6] = { PIO2_COUNTER0, PIO2_COUNTER1,
PIO2_COUNTER2, PIO2_COUNTER3, PIO2_COUNTER2, PIO2_COUNTER3,
...@@ -133,8 +133,8 @@ static const int PIO2_COUNTER[6] = { PIO2_COUNTER0, PIO2_COUNTER1, ...@@ -133,8 +133,8 @@ static const int PIO2_COUNTER[6] = { PIO2_COUNTER0, PIO2_COUNTER1,
/* PIO2_REGS_CTRL (0x18) */ /* PIO2_REGS_CTRL (0x18) */
#define PIO2_VME_INT_MASK 0x7 #define PIO2_VME_INT_MASK 0x7
#define PIO2_LED BIT(6) #define PIO2_LED (1 << 6)
#define PIO2_LOOP BIT(7) #define PIO2_LOOP (1 << 7)
/* PIO2_REGS_VME_VECTOR (0x19) */ /* PIO2_REGS_VME_VECTOR (0x19) */
#define PIO2_VME_VECTOR_SPUR 0x0 #define PIO2_VME_VECTOR_SPUR 0x0
...@@ -179,25 +179,25 @@ static const int PIO2_CNTR_CTRL[6] = { PIO2_REGS_CTRL_WRD0, ...@@ -179,25 +179,25 @@ static const int PIO2_CNTR_CTRL[6] = { PIO2_REGS_CTRL_WRD0,
PIO2_REGS_CTRL_WRD1 }; PIO2_REGS_CTRL_WRD1 };
#define PIO2_CNTR_SC_DEV0 0 #define PIO2_CNTR_SC_DEV0 0
#define PIO2_CNTR_SC_DEV1 BIT(6) #define PIO2_CNTR_SC_DEV1 (1 << 6)
#define PIO2_CNTR_SC_DEV2 BIT(7) #define PIO2_CNTR_SC_DEV2 (2 << 6)
#define PIO2_CNTR_SC_RDBACK (BIT(6) | BIT(7)) #define PIO2_CNTR_SC_RDBACK (3 << 6)
static const int PIO2_CNTR_SC_DEV[6] = { PIO2_CNTR_SC_DEV0, PIO2_CNTR_SC_DEV1, static const int PIO2_CNTR_SC_DEV[6] = { PIO2_CNTR_SC_DEV0, PIO2_CNTR_SC_DEV1,
PIO2_CNTR_SC_DEV2, PIO2_CNTR_SC_DEV0, PIO2_CNTR_SC_DEV2, PIO2_CNTR_SC_DEV0,
PIO2_CNTR_SC_DEV1, PIO2_CNTR_SC_DEV2 }; PIO2_CNTR_SC_DEV1, PIO2_CNTR_SC_DEV2 };
#define PIO2_CNTR_RW_LATCH 0 #define PIO2_CNTR_RW_LATCH 0
#define PIO2_CNTR_RW_LSB BIT(4) #define PIO2_CNTR_RW_LSB (1 << 4)
#define PIO2_CNTR_RW_MSB BIT(5) #define PIO2_CNTR_RW_MSB (2 << 4)
#define PIO2_CNTR_RW_BOTH (BIT(4) | BIT(5)) #define PIO2_CNTR_RW_BOTH (3 << 4)
#define PIO2_CNTR_MODE0 0 #define PIO2_CNTR_MODE0 0
#define PIO2_CNTR_MODE1 BIT(1) #define PIO2_CNTR_MODE1 (1 << 1)
#define PIO2_CNTR_MODE2 BIT(2) #define PIO2_CNTR_MODE2 (2 << 1)
#define PIO2_CNTR_MODE3 (BIT(1) | BIT(2)) #define PIO2_CNTR_MODE3 (3 << 1)
#define PIO2_CNTR_MODE4 BIT(4) #define PIO2_CNTR_MODE4 (4 << 1)
#define PIO2_CNTR_MODE5 (BIT(1) | BIT(3)) #define PIO2_CNTR_MODE5 (5 << 1)
#define PIO2_CNTR_BCD 1 #define PIO2_CNTR_BCD 1
......
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