]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: ftgmac100: Simplify condition on HW arbitration
authorAndrew Lunn <andrew@lunn.ch>
Fri, 6 Feb 2026 03:17:53 +0000 (11:17 +0800)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 10 Feb 2026 12:40:50 +0000 (13:40 +0100)
The MAC ID is sufficient to indicate this is a ast2600.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Jacky Chou <jacky_chou@aspeedtech.com>
Link: https://patch.msgid.link/20260206-ftgmac-cleanup-v5-13-ad28a9067ea7@aspeedtech.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ethernet/faraday/ftgmac100.c

index b86e478532174aa1ad0c941b731d532e7a48bbf7..410c5ab82516583de8d568ed3560d4d61407a61c 100644 (file)
@@ -2046,13 +2046,13 @@ static int ftgmac100_probe(struct platform_device *pdev)
                err = ftgmac100_setup_clk(priv);
                if (err)
                        goto err;
-
-               /* Disable ast2600 problematic HW arbitration */
-               if (priv->mac_id == FTGMAC100_AST2600)
-                       iowrite32(FTGMAC100_TM_DEFAULT,
-                                 priv->base + FTGMAC100_OFFSET_TM);
        }
 
+       /* Disable ast2600 problematic HW arbitration */
+       if (priv->mac_id == FTGMAC100_AST2600)
+               iowrite32(FTGMAC100_TM_DEFAULT,
+                         priv->base + FTGMAC100_OFFSET_TM);
+
        /* Default ring sizes */
        priv->rx_q_entries = priv->new_rx_q_entries = DEF_RX_QUEUE_ENTRIES;
        priv->tx_q_entries = priv->new_tx_q_entries = DEF_TX_QUEUE_ENTRIES;