tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
mmc: cqhci: Ensure macro parameters are wrapped in parentheses
Absence of parentheses is not affecting current code, but ensure macro
parameters are wrapped in parentheses.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: a4080225f51d ("mmc: cqhci: support for command queue enabled host")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
authored by
Adrian Hunter
and committed by
Ulf Hansson
0562315b
126b6270
+21
-21
+21
-21
drivers/mmc/host/cqhci.h
+21
-21
drivers/mmc/host/cqhci.h
···
61
61
#define CQHCI_IC_ENABLE BIT(31)
62
62
#define CQHCI_IC_RESET BIT(16)
63
63
#define CQHCI_IC_ICCTHWEN BIT(15)
64
-
#define CQHCI_IC_ICCTH(x) ((x & 0x1F) << 8)
64
+
#define CQHCI_IC_ICCTH(x) (((x) & 0x1F) << 8)
65
65
#define CQHCI_IC_ICTOVALWEN BIT(7)
66
-
#define CQHCI_IC_ICTOVAL(x) (x & 0x7F)
66
+
#define CQHCI_IC_ICTOVAL(x) ((x) & 0x7F)
67
67
68
68
/* task list base address */
69
69
#define CQHCI_TDLBA 0x20
···
119
119
#define CQHCI_IC_DEFAULT_ICTOVAL 1
120
120
121
121
/* attribute fields */
122
-
#define CQHCI_VALID(x) ((x & 1) << 0)
123
-
#define CQHCI_END(x) ((x & 1) << 1)
124
-
#define CQHCI_INT(x) ((x & 1) << 2)
125
-
#define CQHCI_ACT(x) ((x & 0x7) << 3)
122
+
#define CQHCI_VALID(x) (((x) & 1) << 0)
123
+
#define CQHCI_END(x) (((x) & 1) << 1)
124
+
#define CQHCI_INT(x) (((x) & 1) << 2)
125
+
#define CQHCI_ACT(x) (((x) & 0x7) << 3)
126
126
127
127
/* data command task descriptor fields */
128
-
#define CQHCI_FORCED_PROG(x) ((x & 1) << 6)
129
-
#define CQHCI_CONTEXT(x) ((x & 0xF) << 7)
130
-
#define CQHCI_DATA_TAG(x) ((x & 1) << 11)
131
-
#define CQHCI_DATA_DIR(x) ((x & 1) << 12)
132
-
#define CQHCI_PRIORITY(x) ((x & 1) << 13)
133
-
#define CQHCI_QBAR(x) ((x & 1) << 14)
134
-
#define CQHCI_REL_WRITE(x) ((x & 1) << 15)
135
-
#define CQHCI_BLK_COUNT(x) ((x & 0xFFFF) << 16)
136
-
#define CQHCI_BLK_ADDR(x) ((x & 0xFFFFFFFF) << 32)
128
+
#define CQHCI_FORCED_PROG(x) (((x) & 1) << 6)
129
+
#define CQHCI_CONTEXT(x) (((x) & 0xF) << 7)
130
+
#define CQHCI_DATA_TAG(x) (((x) & 1) << 11)
131
+
#define CQHCI_DATA_DIR(x) (((x) & 1) << 12)
132
+
#define CQHCI_PRIORITY(x) (((x) & 1) << 13)
133
+
#define CQHCI_QBAR(x) (((x) & 1) << 14)
134
+
#define CQHCI_REL_WRITE(x) (((x) & 1) << 15)
135
+
#define CQHCI_BLK_COUNT(x) (((x) & 0xFFFF) << 16)
136
+
#define CQHCI_BLK_ADDR(x) (((x) & 0xFFFFFFFF) << 32)
137
137
138
138
/* direct command task descriptor fields */
139
-
#define CQHCI_CMD_INDEX(x) ((x & 0x3F) << 16)
140
-
#define CQHCI_CMD_TIMING(x) ((x & 1) << 22)
141
-
#define CQHCI_RESP_TYPE(x) ((x & 0x3) << 23)
139
+
#define CQHCI_CMD_INDEX(x) (((x) & 0x3F) << 16)
140
+
#define CQHCI_CMD_TIMING(x) (((x) & 1) << 22)
141
+
#define CQHCI_RESP_TYPE(x) (((x) & 0x3) << 23)
142
142
143
143
/* transfer descriptor fields */
144
-
#define CQHCI_DAT_LENGTH(x) ((x & 0xFFFF) << 16)
145
-
#define CQHCI_DAT_ADDR_LO(x) ((x & 0xFFFFFFFF) << 32)
146
-
#define CQHCI_DAT_ADDR_HI(x) ((x & 0xFFFFFFFF) << 0)
144
+
#define CQHCI_DAT_LENGTH(x) (((x) & 0xFFFF) << 16)
145
+
#define CQHCI_DAT_ADDR_LO(x) (((x) & 0xFFFFFFFF) << 32)
146
+
#define CQHCI_DAT_ADDR_HI(x) (((x) & 0xFFFFFFFF) << 0)
147
147
148
148
struct cqhci_host_ops;
149
149
struct mmc_host;