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 <[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 343af465e43f200fde1709b4eb3b2aae6a786c33..e58115c7a3105c38587effd37f2f64df1bd59d65 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
@@ -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 9befe9799ab3d8182b7e1f00072ae4f611bc4d71..158dbc0170eb97af6bfd9b7bcd784f852df37fe6 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
@@ -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 574218d5b4cd191c4b0487da2fee4849bf52f1a2..ad1493a5141db1a588bfa476d15fd3d9d8258a63 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
@@ -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[])