stmmac: remove BUS_MODE_DA

This is a very old and often unused option to configure
a bit in a register inside the DMA. This support should
not stay under Koption and should be extended for new chips too.
This will be do later maybe via device-tree parameters.
Also no performance impact when remove this setting on STi platforms.

Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index af5228ac56006dcb5efc8c6dcb455f4a171dccf2..33b85bae6c214d5cb6bbdfca3b4f7f6c51220248 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -37,14 +37,4 @@ config STMMAC_PCI
          D1215994A VIRTEX FPGA board.
 
          If unsure, say N.
-
-config STMMAC_DA
-       bool "STMMAC DMA arbitration scheme"
-       default n
-       ---help---
-         Selecting this option, rx has priority over Tx (only for Giga
-         Ethernet device).
-         By default, the DMA arbitration scheme is based on Round-robin
-         (rx:tx priority is 1:1).
-
 endif

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
index 0c2058a69fd21fea367e56687a8f56066cec1acc..59d92e811750295e6125cdfcf4f410da6aa21bba 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
@@ -70,10 +70,6 @@ static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, int fb, int mb,
        if (mb)
                value |= DMA_BUS_MODE_MB;
 
-#ifdef CONFIG_STMMAC_DA
-       value |= DMA_BUS_MODE_DA;       /* Rx has priority over tx */
-#endif
-
        if (atds)
                value |= DMA_BUS_MODE_ATDS;