net: stmmac: Drop redundant dwxgmac_tc_ops variable

dwmac510_tc_ops and dwxgmac_tc_ops are completely identical,
keep dwmac510_tc_ops to provide better backward compatibility.

Signed-off-by: Furong Xu <0x1207@gmail.com>
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
Link: https://patch.msgid.link/20241212033325.282817-1-0x1207@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c
index 4bd79de2e22208db6d55b9d275f957a6b094010b..31bdbab9a46ca2458c1ad195de2008baffed4554 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.c
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c
@@ -267,7 +267,7 @@ static const struct stmmac_hwif_entry {
                .hwtimestamp = &stmmac_ptp,
                .ptp = &stmmac_ptp_clock_ops,
                .mode = NULL,
-               .tc = &dwxgmac_tc_ops,
+               .tc = &dwmac510_tc_ops,
                .mmc = &dwxgmac_mmc_ops,
                .est = &dwmac510_est_ops,
                .setup = dwxgmac2_setup,
@@ -290,7 +290,7 @@ static const struct stmmac_hwif_entry {
                .hwtimestamp = &stmmac_ptp,
                .ptp = &stmmac_ptp_clock_ops,
                .mode = NULL,
-               .tc = &dwxgmac_tc_ops,
+               .tc = &dwmac510_tc_ops,
                .mmc = &dwxgmac_mmc_ops,
                .est = &dwmac510_est_ops,
                .setup = dwxlgmac2_setup,

diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
index e428c82b7d317e74deaec3a932604c1420823512..2f7295b6c1c54544945bcd8ac56c77bba065579a 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@ -685,7 +685,6 @@ extern const struct stmmac_dma_ops dwmac410_dma_ops;
 extern const struct stmmac_ops dwmac510_ops;
 extern const struct stmmac_tc_ops dwmac4_tc_ops;
 extern const struct stmmac_tc_ops dwmac510_tc_ops;
-extern const struct stmmac_tc_ops dwxgmac_tc_ops;
 
 #define GMAC_VERSION           0x00000020      /* GMAC CORE Version */
 #define GMAC4_VERSION          0x00000110      /* GMAC4+ CORE Version */

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
index 6a79e6a111ed902c52235b0cc4414059238b8c15..694d6ee1438197bd4434af6e9b78f022e94ff98f 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
@@ -1284,14 +1284,3 @@ const struct stmmac_tc_ops dwmac510_tc_ops = {
        .query_caps = tc_query_caps,
        .setup_mqprio = tc_setup_dwmac510_mqprio,
 };
-
-const struct stmmac_tc_ops dwxgmac_tc_ops = {
-       .init = tc_init,
-       .setup_cls_u32 = tc_setup_cls_u32,
-       .setup_cbs = tc_setup_cbs,
-       .setup_cls = tc_setup_cls,
-       .setup_taprio = tc_setup_taprio,
-       .setup_etf = tc_setup_etf,
-       .query_caps = tc_query_caps,
-       .setup_mqprio = tc_setup_dwmac510_mqprio,
-};