[openwrt/openwrt] realtek: Use BIT(x) helper instead of manual shift
LEDE Commits
lede-commits at lists.infradead.org
Mon Nov 24 15:30:14 PST 2025
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/583807806c5efe9e522d73f765e0af553bbc38ea
commit 583807806c5efe9e522d73f765e0af553bbc38ea
Author: Sven Eckelmann <sven at narfation.org>
AuthorDate: Sun Nov 23 17:17:55 2025 +0100
realtek: Use BIT(x) helper instead of manual shift
Instead of manually writing shift operations, it is preferred to
use BIT(b) or GENMASK(e, s).
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>
---
.../files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h | 48 +++++++++++-----------
.../files-6.12/drivers/net/ethernet/rtl838x_eth.h | 12 +++---
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h
index 011b2cf37e..bbb37d47c8 100644
--- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h
+++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h
@@ -132,39 +132,39 @@
#define RTL_SPEED_5000 6
#define RTL_SPEED_10000 4
-#define RTL83XX_FORCE_EN (1 << 0)
-#define RTL83XX_FORCE_LINK_EN (1 << 1)
+#define RTL83XX_FORCE_EN BIT(0)
+#define RTL83XX_FORCE_LINK_EN BIT(1)
-#define RTL838X_NWAY_EN (1 << 2)
-#define RTL838X_DUPLEX_MODE (1 << 3)
+#define RTL838X_NWAY_EN BIT(2)
+#define RTL838X_DUPLEX_MODE BIT(3)
#define RTL838X_SPEED_SHIFT (4)
#define RTL838X_SPEED_MASK (3 << RTL838X_SPEED_SHIFT)
-#define RTL838X_TX_PAUSE_EN (1 << 6)
-#define RTL838X_RX_PAUSE_EN (1 << 7)
-#define RTL838X_MAC_FORCE_FC_EN (1 << 8)
+#define RTL838X_TX_PAUSE_EN BIT(6)
+#define RTL838X_RX_PAUSE_EN BIT(7)
+#define RTL838X_MAC_FORCE_FC_EN BIT(8)
-#define RTL839X_DUPLEX_MODE (1 << 2)
+#define RTL839X_DUPLEX_MODE BIT(2)
#define RTL839X_SPEED_SHIFT (3)
#define RTL839X_SPEED_MASK (3 << RTL839X_SPEED_SHIFT)
-#define RTL839X_TX_PAUSE_EN (1 << 5)
-#define RTL839X_RX_PAUSE_EN (1 << 6)
-#define RTL839X_MAC_FORCE_FC_EN (1 << 7)
+#define RTL839X_TX_PAUSE_EN BIT(5)
+#define RTL839X_RX_PAUSE_EN BIT(6)
+#define RTL839X_MAC_FORCE_FC_EN BIT(7)
-#define RTL930X_FORCE_EN (1 << 0)
-#define RTL930X_FORCE_LINK_EN (1 << 1)
-#define RTL930X_DUPLEX_MODE (1 << 2)
+#define RTL930X_FORCE_EN BIT(0)
+#define RTL930X_FORCE_LINK_EN BIT(1)
+#define RTL930X_DUPLEX_MODE BIT(2)
#define RTL930X_SPEED_SHIFT (3)
#define RTL930X_SPEED_MASK (15 << RTL930X_SPEED_SHIFT)
-#define RTL930X_TX_PAUSE_EN (1 << 7)
-#define RTL930X_RX_PAUSE_EN (1 << 8)
-#define RTL930X_MAC_FORCE_FC_EN (1 << 9)
-
-#define RTL931X_FORCE_EN (1 << 9)
-#define RTL931X_FORCE_LINK_EN (1 << 0)
-#define RTL931X_DUPLEX_MODE (1 << 2)
-#define RTL931X_MAC_FORCE_FC_EN (1 << 4)
-#define RTL931X_TX_PAUSE_EN (1 << 16)
-#define RTL931X_RX_PAUSE_EN (1 << 17)
+#define RTL930X_TX_PAUSE_EN BIT(7)
+#define RTL930X_RX_PAUSE_EN BIT(8)
+#define RTL930X_MAC_FORCE_FC_EN BIT(9)
+
+#define RTL931X_FORCE_EN BIT(9)
+#define RTL931X_FORCE_LINK_EN BIT(0)
+#define RTL931X_DUPLEX_MODE BIT(2)
+#define RTL931X_MAC_FORCE_FC_EN BIT(4)
+#define RTL931X_TX_PAUSE_EN BIT(16)
+#define RTL931X_RX_PAUSE_EN BIT(17)
/* EEE */
#define RTL838X_MAC_EEE_ABLTY (0xa1a8)
diff --git a/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.h b/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.h
index e66a4083cf..76914dc614 100644
--- a/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.h
+++ b/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.h
@@ -151,12 +151,12 @@
#define RTL930X_L2_PORT_DABLK_CTRL (0x9060)
/* MAC link state bits */
-#define FORCE_EN (1 << 0)
-#define FORCE_LINK_EN (1 << 1)
-#define NWAY_EN (1 << 2)
-#define DUPLX_MODE (1 << 3)
-#define TX_PAUSE_EN (1 << 6)
-#define RX_PAUSE_EN (1 << 7)
+#define FORCE_EN BIT(0)
+#define FORCE_LINK_EN BIT(1)
+#define NWAY_EN BIT(2)
+#define DUPLX_MODE BIT(3)
+#define TX_PAUSE_EN BIT(6)
+#define RX_PAUSE_EN BIT(7)
/* L2 Notification DMA interface */
#define RTL839X_DMA_IF_NBUF_BASE_DESC_ADDR_CTRL (0x785C)
More information about the lede-commits
mailing list