[PATCH net-next v1] net: stmmac: Drop redundant dwxgmac_tc_ops variable
Michal Swiatkowski
michal.swiatkowski at linux.intel.com
Thu Dec 12 01:08:49 PST 2024
On Thu, Dec 12, 2024 at 11:33:25AM +0800, Furong Xu wrote:
> 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 at gmail.com>
> ---
> drivers/net/ethernet/stmicro/stmmac/hwif.c | 4 ++--
> drivers/net/ethernet/stmicro/stmmac/hwif.h | 1 -
> drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 11 -----------
> 3 files changed, 2 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c
> index 4bd79de2e222..31bdbab9a46c 100644
> --- 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 e428c82b7d31..2f7295b6c1c5 100644
> --- 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 6a79e6a111ed..694d6ee14381 100644
> --- 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,
> -};
LGTM
Reviewed-by: Michal Swiatkowski <michal.swiatkowski at linux.intel.com>
Thanks
> --
> 2.34.1
More information about the linux-arm-kernel
mailing list