net: stmmac: Remove if condition by taking advantage of hwif return code

We can remove the if condition and check if return code is different
than -EINVAL, meaning callback is present.

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>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index f2687ec3c7749b79dd0e0dd7dc3435e6135cec98..c32de53a00d3eb26bd436165b2e3eb7c1a40959c 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3644,6 +3644,7 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id)
        /* To handle GMAC own interrupts */
        if ((priv->plat->has_gmac) || (priv->plat->has_gmac4)) {
                int status = stmmac_host_irq_status(priv, priv->hw, &priv->xstats);
+               int mtl_status;
 
                if (unlikely(status)) {
                        /* For LPI we need to save the tx status */
@@ -3653,20 +3654,18 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id)
                                priv->tx_path_in_lpi_mode = false;
                }
 
-               if (priv->synopsys_id >= DWMAC_CORE_4_00) {
-                       for (queue = 0; queue < queues_count; queue++) {
-                               struct stmmac_rx_queue *rx_q =
-                               &priv->rx_queue[queue];
+               for (queue = 0; queue < queues_count; queue++) {
+                       struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
 
-                               status |= stmmac_host_mtl_irq_status(priv,
-                                               priv->hw, queue);
+                       mtl_status = stmmac_host_mtl_irq_status(priv, priv->hw,
+                                                               queue);
+                       if (mtl_status != -EINVAL)
+                               status |= mtl_status;
 
-                               if (status & CORE_IRQ_MTL_RX_OVERFLOW)
-                                       stmmac_set_rx_tail_ptr(priv,
-                                                       priv->ioaddr,
-                                                       rx_q->rx_tail_addr,
-                                                       queue);
-                       }
+                       if (status & CORE_IRQ_MTL_RX_OVERFLOW)
+                               stmmac_set_rx_tail_ptr(priv, priv->ioaddr,
+                                                      rx_q->rx_tail_addr,
+                                                      queue);
                }
 
                /* PCS link status */