From: Birger Koblitz <git@birger-koblitz.de>
Date: Sat, 1 Jan 2022 12:52:04 +0000 (+0100)
Subject: realtek: rename rtl838x_reg structure
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=90242020529cef66c4ceccd56396b669ea4ad818;p=openwrt%2Fstaging%2Fblocktrron.git

realtek: rename rtl838x_reg structure

Rename the SoC-specific rtl838x_reg structure in the Ethernet
driver to avoid confusion with the structure of the same name
in the DSA driver. New name is: rtl838x_eth_reg

Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
---

diff --git a/target/linux/realtek/files-5.10/drivers/net/ethernet/rtl838x_eth.c b/target/linux/realtek/files-5.10/drivers/net/ethernet/rtl838x_eth.c
index fdc2227c19..cdfc2148e8 100644
--- a/target/linux/realtek/files-5.10/drivers/net/ethernet/rtl838x_eth.c
+++ b/target/linux/realtek/files-5.10/drivers/net/ethernet/rtl838x_eth.c
@@ -182,7 +182,7 @@ struct rtl838x_eth_priv {
 	struct phylink_config phylink_config;
 	u16 id;
 	u16 family_id;
-	const struct rtl838x_reg *r;
+	const struct rtl838x_eth_reg *r;
 	u8 cpu_port;
 	u32 lastEvent;
 	u16 rxrings;
@@ -515,7 +515,7 @@ static irqreturn_t rtl93xx_net_irq(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static const struct rtl838x_reg rtl838x_reg = {
+static const struct rtl838x_eth_reg rtl838x_reg = {
 	.net_irq = rtl83xx_net_irq,
 	.mac_port_ctrl = rtl838x_mac_port_ctrl,
 	.dma_if_intr_sts = RTL838X_DMA_IF_INTR_STS,
@@ -540,7 +540,7 @@ static const struct rtl838x_reg rtl838x_reg = {
 	.decode_tag = rtl838x_decode_tag,
 };
 
-static const struct rtl838x_reg rtl839x_reg = {
+static const struct rtl838x_eth_reg rtl839x_reg = {
 	.net_irq = rtl83xx_net_irq,
 	.mac_port_ctrl = rtl839x_mac_port_ctrl,
 	.dma_if_intr_sts = RTL839X_DMA_IF_INTR_STS,
@@ -565,7 +565,7 @@ static const struct rtl838x_reg rtl839x_reg = {
 	.decode_tag = rtl839x_decode_tag,
 };
 
-static const struct rtl838x_reg rtl930x_reg = {
+static const struct rtl838x_eth_reg rtl930x_reg = {
 	.net_irq = rtl93xx_net_irq,
 	.mac_port_ctrl = rtl930x_mac_port_ctrl,
 	.dma_if_intr_rx_runout_sts = RTL930X_DMA_IF_INTR_RX_RUNOUT_STS,
@@ -596,7 +596,7 @@ static const struct rtl838x_reg rtl930x_reg = {
 	.decode_tag = rtl930x_decode_tag,
 };
 
-static const struct rtl838x_reg rtl931x_reg = {
+static const struct rtl838x_eth_reg rtl931x_reg = {
 	.net_irq = rtl93xx_net_irq,
 	.mac_port_ctrl = rtl931x_mac_port_ctrl,
 	.dma_if_intr_rx_runout_sts = RTL931X_DMA_IF_INTR_RX_RUNOUT_STS,
diff --git a/target/linux/realtek/files-5.10/drivers/net/ethernet/rtl838x_eth.h b/target/linux/realtek/files-5.10/drivers/net/ethernet/rtl838x_eth.h
index d2691bfaf5..ab7dcd22eb 100644
--- a/target/linux/realtek/files-5.10/drivers/net/ethernet/rtl838x_eth.h
+++ b/target/linux/realtek/files-5.10/drivers/net/ethernet/rtl838x_eth.h
@@ -383,7 +383,7 @@ inline u32 rtl931x_get_mac_tx_pause_sts(int p)
 struct p_hdr;
 struct dsa_tag;
 
-struct rtl838x_reg {
+struct rtl838x_eth_reg {
 	irqreturn_t (*net_irq)(int irq, void *dev_id);
 	int (*mac_port_ctrl)(int port);
 	int dma_if_intr_sts;