realtek: Enclose complex macros in parentheses

The macros will be inserted as is by the pre-compiler into places which
uses them. This can cause weird effects because this can break the syntax
or the ordering of operations. Just adding parentheses can avoid a lot of
these unexpected effects.

(for even more complex, multi-expression macros, `do {...} while (0)` is
required).

Signed-off-by: Sven Eckelmann <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20906
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c
index f78f26db18512cf3996c3952bec9e61b42cf0889..723772b5d370c04c2dbe1e7ecd29a3a036e1d7b1 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c
+++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c
@@ -14,7 +14,7 @@
 #define RTL838X_VLAN_PORT_TAG_STS_CTRL_BASE                    0xA530
 /* port 0-28 */
 #define RTL838X_VLAN_PORT_TAG_STS_CTRL(port) \
-               RTL838X_VLAN_PORT_TAG_STS_CTRL_BASE + (port << 2)
+       (RTL838X_VLAN_PORT_TAG_STS_CTRL_BASE + (port << 2))
 
 #define RTL838X_VLAN_PORT_TAG_STS_CTRL_EGR_P_OTAG_KEEP_MASK    GENMASK(11,10)
 #define RTL838X_VLAN_PORT_TAG_STS_CTRL_EGR_P_ITAG_KEEP_MASK    GENMASK(9,8)

diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c
index 28e8313aff7c6a4df4ab4c5bb2052cc40a7cbdd9..9a99879844c0188e2aebb940247cb26b2ede1883 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c
+++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c
@@ -12,7 +12,7 @@
 #define RTL839X_VLAN_PORT_TAG_STS_CTRL_BASE                    0x6828
 /* port 0-52 */
 #define RTL839X_VLAN_PORT_TAG_STS_CTRL(port) \
-               RTL839X_VLAN_PORT_TAG_STS_CTRL_BASE + (port << 2)
+       (RTL839X_VLAN_PORT_TAG_STS_CTRL_BASE + (port << 2))
 #define RTL839X_VLAN_PORT_TAG_STS_CTRL_OTAG_STS_MASK           GENMASK(7,6)
 #define RTL839X_VLAN_PORT_TAG_STS_CTRL_ITAG_STS_MASK           GENMASK(5,4)
 #define RTL839X_VLAN_PORT_TAG_STS_CTRL_EGR_P_OTAG_KEEP_MASK    GENMASK(3,3)

diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c
index a27fe195abbbb0d4ed30ca9d8b5e55e870c0fb80..bd860e7273349e3082fec8990d7d173c0fb69858 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c
+++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c
@@ -14,7 +14,7 @@
 #define RTL930X_VLAN_PORT_TAG_STS_CTRL_BASE                    0xCE24
 /* port 0-28 */
 #define RTL930X_VLAN_PORT_TAG_STS_CTRL(port) \
-               RTL930X_VLAN_PORT_TAG_STS_CTRL_BASE + (port << 2)
+       (RTL930X_VLAN_PORT_TAG_STS_CTRL_BASE + (port << 2))
 #define RTL930X_VLAN_PORT_TAG_STS_CTRL_EGR_OTAG_STS_MASK       GENMASK(7,6)
 #define RTL930X_VLAN_PORT_TAG_STS_CTRL_EGR_ITAG_STS_MASK       GENMASK(5,4)
 #define RTL930X_VLAN_PORT_TAG_STS_CTRL_EGR_P_OTAG_KEEP_MASK    GENMASK(3,3)

diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c
index a606116ead88ecb1254dcdb21a353849d9be9ca8..d8a047f356a1de0befbe25b3643cdd0060769ee3 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c
+++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c
@@ -13,7 +13,7 @@
 #define RTL931X_VLAN_PORT_TAG_CTRL_BASE                                0x4860
 /* port 0-56 */
 #define RTL931X_VLAN_PORT_TAG_CTRL(port) \
-               RTL931X_VLAN_PORT_TAG_CTRL_BASE + (port << 2)
+       (RTL931X_VLAN_PORT_TAG_CTRL_BASE + (port << 2))
 #define RTL931X_VLAN_PORT_TAG_EGR_OTAG_STS_MASK                        GENMASK(13,12)
 #define RTL931X_VLAN_PORT_TAG_EGR_ITAG_STS_MASK                        GENMASK(11,10)
 #define RTL931X_VLAN_PORT_TAG_EGR_OTAG_KEEP_MASK               GENMASK(9,9)