diff options
| author | Dejin Zheng <zhengdejin5@gmail.com> | 2020-03-19 21:16:38 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-19 21:05:27 -0700 |
| commit | 3fd177cb2b47b29d36431229e4737e7286eefa29 (patch) | |
| tree | ae159d728478ba6e414fe00ee3bff02f7704241b | |
| parent | 09d65e6d631c052d6b03ef862e93cbb10649df58 (diff) | |
| download | linux-starfive-3fd177cb2b47b29d36431229e4737e7286eefa29.tar.gz linux-starfive-3fd177cb2b47b29d36431229e4737e7286eefa29.tar.bz2 linux-starfive-3fd177cb2b47b29d36431229e4737e7286eefa29.zip | |
net: stmmac: dwmac_lib: remove unnecessary checks in dwmac_dma_reset()
it will check the return value of dwmac_dma_reset() in the
stmmac_init_dma_engine() function and report an error if the
return value is not zero. so don't need check here.
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c index 688d36095333..cb87d31a99df 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c @@ -16,19 +16,14 @@ int dwmac_dma_reset(void __iomem *ioaddr) { u32 value = readl(ioaddr + DMA_BUS_MODE); - int err; /* DMA SW reset */ value |= DMA_BUS_MODE_SFT_RESET; writel(value, ioaddr + DMA_BUS_MODE); - err = readl_poll_timeout(ioaddr + DMA_BUS_MODE, value, + return readl_poll_timeout(ioaddr + DMA_BUS_MODE, value, !(value & DMA_BUS_MODE_SFT_RESET), 10000, 100000); - if (err) - return -EBUSY; - - return 0; } /* CSR1 enables the transmit DMA to check for new descriptor */ |