diff options
author | Jose Abreu | 2018-05-18 15:56:05 +0200 |
---|---|---|
committer | David S. Miller | 2018-05-18 17:00:15 +0200 |
commit | 24aaed0cc0953fce632d539a148025f0e4a82bcf (patch) | |
tree | f99bc7d9ee3c13569b5d5bcff58ed90c44e063e0 /drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | |
parent | net: stmmac: Move PTP and MMC base address calculation to hwif.c (diff) | |
download | kernel-qcow2-linux-24aaed0cc0953fce632d539a148025f0e4a82bcf.tar.gz kernel-qcow2-linux-24aaed0cc0953fce632d539a148025f0e4a82bcf.tar.xz kernel-qcow2-linux-24aaed0cc0953fce632d539a148025f0e4a82bcf.zip |
net: stmmac: Uniformize the use of dma_init_* callbacks
Instead of relying on the GMAC version for choosing if we need to use
dma_init or dma_init_{rx/tx}_chan callback, lets uniformize this and
always use the dma_init_{rx/tx}_chan callbacks.
While at it, fix the use of dma_init_chan callback, which shall be
called for as many channels as the max of rx/tx channels.
Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: Vitor Soares <soares@synopsys.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c')
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c index 9aab5b35e2d8..bf8e5a16f11c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c @@ -120,8 +120,7 @@ static void dwmac4_dma_init_channel(void __iomem *ioaddr, } static void dwmac4_dma_init(void __iomem *ioaddr, - struct stmmac_dma_cfg *dma_cfg, - u32 dma_tx, u32 dma_rx, int atds) + struct stmmac_dma_cfg *dma_cfg, int atds) { u32 value = readl(ioaddr + DMA_SYS_BUS_MODE); |