Skip to content

Commit 96b4887

Browse files
lunnPaolo Abeni
authored andcommitted
net: ftgmac100: Simplify condition on HW arbitration
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>
1 parent 0855b43 commit 96b4887

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/net/ethernet/faraday/ftgmac100.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2046,13 +2046,13 @@ static int ftgmac100_probe(struct platform_device *pdev)
20462046
err = ftgmac100_setup_clk(priv);
20472047
if (err)
20482048
goto err;
2049-
2050-
/* Disable ast2600 problematic HW arbitration */
2051-
if (priv->mac_id == FTGMAC100_AST2600)
2052-
iowrite32(FTGMAC100_TM_DEFAULT,
2053-
priv->base + FTGMAC100_OFFSET_TM);
20542049
}
20552050

2051+
/* Disable ast2600 problematic HW arbitration */
2052+
if (priv->mac_id == FTGMAC100_AST2600)
2053+
iowrite32(FTGMAC100_TM_DEFAULT,
2054+
priv->base + FTGMAC100_OFFSET_TM);
2055+
20562056
/* Default ring sizes */
20572057
priv->rx_q_entries = priv->new_rx_q_entries = DEF_RX_QUEUE_ENTRIES;
20582058
priv->tx_q_entries = priv->new_tx_q_entries = DEF_TX_QUEUE_ENTRIES;

0 commit comments

Comments
 (0)