[openwrt/openwrt] realtek: Avoid line continuations in quoted strings
LEDE Commits
lede-commits at lists.infradead.org
Mon Nov 24 15:29:56 PST 2025
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/f6ba70739dd5d5d4ba07c111b89f1552047e2134
commit f6ba70739dd5d5d4ba07c111b89f1552047e2134
Author: Sven Eckelmann <sven at narfation.org>
AuthorDate: Sun Nov 23 14:44:11 2025 +0100
realtek: Avoid line continuations in quoted strings
It is preferred to have the whole quoted string on a single line to make it
easier to find these lines in the source code (while grep'ing). And since
these quotes are inside a string, they will also add unwanted whitespaces.
At the same time, add the missing newine at the end of the `pr_debug`
lines.
Signed-off-by: Sven Eckelmann <sven at narfation.org>
Link: https://github.com/openwrt/openwrt/pull/20906
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c | 5 ++---
target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c | 7 +++----
target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c | 5 ++---
3 files changed, 7 insertions(+), 10 deletions(-)
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 343af465e4..e58115c7a3 100644
--- 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
@@ -1808,9 +1808,8 @@ void rtl838x_vlan_profile_dump(int profile)
p = sw_r32(RTL838X_VLAN_PROFILE(profile));
- pr_debug("VLAN profile %d: L2 learning: %d, UNKN L2MC FLD PMSK %d, \
- UNKN IPMC FLD PMSK %d, UNKN IPv6MC FLD PMSK: %d",
- profile, p & 1, (p >> 1) & 0x1ff, (p >> 10) & 0x1ff, (p >> 19) & 0x1ff);
+ pr_debug("VLAN profile %d: L2 learning: %d, UNKN L2MC FLD PMSK %d, UNKN IPMC FLD PMSK %d, UNKN IPv6MC FLD PMSK: %d\n",
+ profile, p & 1, (p >> 1) & 0x1ff, (p >> 10) & 0x1ff, (p >> 19) & 0x1ff);
}
void rtl8380_sds_rst(int mac)
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 9befe9799a..158dbc0170 100644
--- 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
@@ -669,10 +669,9 @@ void rtl839x_vlan_profile_dump(int profile)
p[0] = sw_r32(RTL839X_VLAN_PROFILE(profile));
p[1] = sw_r32(RTL839X_VLAN_PROFILE(profile) + 4);
- pr_debug("VLAN profile %d: L2 learning: %d, UNKN L2MC FLD PMSK %d, \
- UNKN IPMC FLD PMSK %d, UNKN IPv6MC FLD PMSK: %d",
- profile, p[1] & 1, (p[1] >> 1) & 0xfff, (p[1] >> 13) & 0xfff,
- (p[0]) & 0xfff);
+ pr_debug("VLAN profile %d: L2 learning: %d, UNKN L2MC FLD PMSK %d, UNKN IPMC FLD PMSK %d, UNKN IPv6MC FLD PMSK: %d\n",
+ profile, p[1] & 1, (p[1] >> 1) & 0xfff, (p[1] >> 13) & 0xfff,
+ (p[0]) & 0xfff);
pr_debug("VLAN profile %d: raw %08x, %08x\n", profile, p[0], p[1]);
}
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 574218d5b4..ad1493a514 100644
--- 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
@@ -148,9 +148,8 @@ static void rtl931x_vlan_profile_dump(int index)
profile[3] = (sw_r32(RTL931X_VLAN_PROFILE_SET(index) + 20) & 0x1FFFFFFFULL) << 32 |
(sw_r32(RTL931X_VLAN_PROFILE_SET(index) + 24) & 0xFFFFFFFF);
- pr_debug("VLAN %d: L2 learning: %d, L2 Unknown MultiCast Field %llx, \
- IPv4 Unknown MultiCast Field %llx, IPv6 Unknown MultiCast Field: %llx",
- index, (u32) (profile[0] & (3 << 14)), profile[1], profile[2], profile[3]);
+ pr_debug("VLAN %d: L2 learning: %d, L2 Unknown MultiCast Field %llx, IPv4 Unknown MultiCast Field %llx, IPv6 Unknown MultiCast Field: %llx\n",
+ index, (u32) (profile[0] & (3 << 14)), profile[1], profile[2], profile[3]);
}
static void rtl931x_stp_get(struct rtl838x_switch_priv *priv, u16 msti, u32 port_state[])
More information about the lede-commits
mailing list