OSDN Git Service

net: stmmac: dwmac_lib: remove unnecessary checks in dwmac_dma_reset()
authorDejin Zheng <zhengdejin5@gmail.com>
Thu, 19 Mar 2020 13:16:38 +0000 (21:16 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 Mar 2020 04:05:27 +0000 (21:05 -0700)
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>
drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c

index 688d360..cb87d31 100644 (file)
 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 */