tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
s390/cio: fix error-prone defines
Missing parenthesis may cause problems when using the defines
together with operations of higher precedence.
Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
authored by
Peter Oberparleiter
and committed by
Martin Schwidefsky
8a80b108
58952942
+19
-19
+19
-19
arch/s390/include/asm/fcx.h
+19
-19
arch/s390/include/asm/fcx.h
···
12
12
13
13
#define TCW_FORMAT_DEFAULT 0
14
14
#define TCW_TIDAW_FORMAT_DEFAULT 0
15
-
#define TCW_FLAGS_INPUT_TIDA 1 << (23 - 5)
16
-
#define TCW_FLAGS_TCCB_TIDA 1 << (23 - 6)
17
-
#define TCW_FLAGS_OUTPUT_TIDA 1 << (23 - 7)
15
+
#define TCW_FLAGS_INPUT_TIDA (1 << (23 - 5))
16
+
#define TCW_FLAGS_TCCB_TIDA (1 << (23 - 6))
17
+
#define TCW_FLAGS_OUTPUT_TIDA (1 << (23 - 7))
18
18
#define TCW_FLAGS_TIDAW_FORMAT(x) ((x) & 3) << (23 - 9)
19
19
#define TCW_FLAGS_GET_TIDAW_FORMAT(x) (((x) >> (23 - 9)) & 3)
20
20
···
54
54
u32 intrg;
55
55
} __attribute__ ((packed, aligned(64)));
56
56
57
-
#define TIDAW_FLAGS_LAST 1 << (7 - 0)
58
-
#define TIDAW_FLAGS_SKIP 1 << (7 - 1)
59
-
#define TIDAW_FLAGS_DATA_INT 1 << (7 - 2)
60
-
#define TIDAW_FLAGS_TTIC 1 << (7 - 3)
61
-
#define TIDAW_FLAGS_INSERT_CBC 1 << (7 - 4)
57
+
#define TIDAW_FLAGS_LAST (1 << (7 - 0))
58
+
#define TIDAW_FLAGS_SKIP (1 << (7 - 1))
59
+
#define TIDAW_FLAGS_DATA_INT (1 << (7 - 2))
60
+
#define TIDAW_FLAGS_TTIC (1 << (7 - 3))
61
+
#define TIDAW_FLAGS_INSERT_CBC (1 << (7 - 4))
62
62
63
63
/**
64
64
* struct tidaw - Transport-Indirect-Addressing Word (TIDAW)
···
106
106
u8 sense[32];
107
107
} __attribute__ ((packed));
108
108
109
-
#define TSA_INTRG_FLAGS_CU_STATE_VALID 1 << (7 - 0)
110
-
#define TSA_INTRG_FLAGS_DEV_STATE_VALID 1 << (7 - 1)
111
-
#define TSA_INTRG_FLAGS_OP_STATE_VALID 1 << (7 - 2)
109
+
#define TSA_INTRG_FLAGS_CU_STATE_VALID (1 << (7 - 0))
110
+
#define TSA_INTRG_FLAGS_DEV_STATE_VALID (1 << (7 - 1))
111
+
#define TSA_INTRG_FLAGS_OP_STATE_VALID (1 << (7 - 2))
112
112
113
113
/**
114
114
* struct tsa_intrg - Interrogate Transport-Status Area (Intrg. TSA)
···
140
140
#define TSB_FORMAT_DDPC 2
141
141
#define TSB_FORMAT_INTRG 3
142
142
143
-
#define TSB_FLAGS_DCW_OFFSET_VALID 1 << (7 - 0)
144
-
#define TSB_FLAGS_COUNT_VALID 1 << (7 - 1)
145
-
#define TSB_FLAGS_CACHE_MISS 1 << (7 - 2)
146
-
#define TSB_FLAGS_TIME_VALID 1 << (7 - 3)
143
+
#define TSB_FLAGS_DCW_OFFSET_VALID (1 << (7 - 0))
144
+
#define TSB_FLAGS_COUNT_VALID (1 << (7 - 1))
145
+
#define TSB_FLAGS_CACHE_MISS (1 << (7 - 2))
146
+
#define TSB_FLAGS_TIME_VALID (1 << (7 - 3))
147
147
#define TSB_FLAGS_FORMAT(x) ((x) & 7)
148
148
#define TSB_FORMAT(t) ((t)->flags & 7)
149
149
···
179
179
#define DCW_INTRG_RCQ_PRIMARY 1
180
180
#define DCW_INTRG_RCQ_SECONDARY 2
181
181
182
-
#define DCW_INTRG_FLAGS_MPM 1 < (7 - 0)
183
-
#define DCW_INTRG_FLAGS_PPR 1 < (7 - 1)
184
-
#define DCW_INTRG_FLAGS_CRIT 1 < (7 - 2)
182
+
#define DCW_INTRG_FLAGS_MPM (1 << (7 - 0))
183
+
#define DCW_INTRG_FLAGS_PPR (1 << (7 - 1))
184
+
#define DCW_INTRG_FLAGS_CRIT (1 << (7 - 2))
185
185
186
186
/**
187
187
* struct dcw_intrg_data - Interrogate DCW data
···
216
216
u8 prog_data[0];
217
217
} __attribute__ ((packed));
218
218
219
-
#define DCW_FLAGS_CC 1 << (7 - 1)
219
+
#define DCW_FLAGS_CC (1 << (7 - 1))
220
220
221
221
#define DCW_CMD_WRITE 0x01
222
222
#define DCW_CMD_READ 0x02