Re: [PATCH net-next v7 1/9] net: stmmac: Pass stmmac_priv and chan in some callbacks
From: Simon Horman <horms@kernel.org>
Date: 2023-12-20 15:08:54
On Tue, Dec 19, 2023 at 10:17:04PM +0800, Yanteng Si wrote:
quoted hunk ↗ jump to hunk
Loongson GMAC and GNET have some special features. To prepare for that, pass stmmac_priv and chan to more callbacks, and adjust the callbacks accordingly. Signed-off-by: Yanteng Si <redacted> Signed-off-by: Feiyang Chen <redacted> Signed-off-by: Yinggang Gu <redacted> --- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 3 ++- drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 3 ++- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 2 +- drivers/net/ethernet/stmicro/stmmac/hwif.h | 11 ++++++----- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- 9 files changed, 18 insertions(+), 15 deletions(-)diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index 137741b94122..7cdfa0bdb93a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c@@ -395,7 +395,7 @@ static void sun8i_dwmac_dma_start_tx(struct stmmac_priv *priv, writel(v, ioaddr + EMAC_TX_CTL1); } -static void sun8i_dwmac_enable_dma_transmission(void __iomem *ioaddr) +static void sun8i_dwmac_enable_dma_transmission(void __iomem *ioaddr, u32 chan) { u32 v;
Hi Yanteng Si,
perhaps dwmac-sun8i.c needs to be further updated for this change?
.../dwmac-sun8i.c:568:10: error: incompatible function pointer types initializing 'void (*)(struct stmmac_priv *, void *, struct stmmac_dma_cfg *, int)' with an expression of type 'void (void *, struct stmmac_dma_cfg *, int)' [-Wincompatible-function-pointer-types]
568 | .init = sun8i_dwmac_dma_init,
| ^~~~~~~~~~~~~~~~~~~~
.../dwmac-sun8i.c:574:29: error: incompatible function pointer types initializing 'void (*)(struct stmmac_priv *, void *, u32)' (aka 'void (*)(struct stmmac_priv *, void *, unsigned int)') with an expression of type 'void (void *, u32)' (aka 'void (void *, unsigned int)') [-Wincompatible-function-pointer-types]
574 | .enable_dma_transmission = sun8i_dwmac_enable_dma_transmission,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 errors generated.