| Message ID | 20241212033325.282817-1-0x1207@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9bc5c9515b4817e994579b21c32c033cbb3b0e6c |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v1] net: stmmac: Drop redundant dwxgmac_tc_ops variable | expand |
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@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@linux.intel.com> Thanks > -- > 2.34.1
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@gmail.com> Reviewed-by: Simon Horman <horms@kernel.org>
On 12/12/2024 4:33 AM, 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@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, > -}; Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Thu, 12 Dec 2024 11:33:25 +0800 you 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@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(-) Here is the summary with links: - [net-next,v1] net: stmmac: Drop redundant dwxgmac_tc_ops variable https://git.kernel.org/netdev/net-next/c/9bc5c9515b48 You are awesome, thank you!
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, -};
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> --- 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(-)