| Message ID | 20200319131019.12829-1-zhengdejin5@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 3fd177cb2b47b29d36431229e4737e7286eefa29 |
| Headers | show |
| Series | net: stmmac: dwmac_lib: remove unnecessary checks in dwmac_dma_reset() | expand |
From: Dejin Zheng <zhengdejin5@gmail.com> Date: Thu, 19 Mar 2020 21:10:19 +0800 > 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> Applied, thanks.
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 */
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> --- drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)