]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: ftgmac100: Replace all of_device_is_compatible()
authorAndrew Lunn <andrew@lunn.ch>
Fri, 6 Feb 2026 03:17:43 +0000 (11:17 +0800)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 10 Feb 2026 12:40:50 +0000 (13:40 +0100)
Now that the priv structure includes the MAC ID, make use of it
instead of the more expensive of_device_is_compatible().

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-3-ad28a9067ea7@aspeedtech.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ethernet/faraday/ftgmac100.c

index 104eb7b1f5bb856870bd0f3f17cf648b8b3c0385..f07167cabf395f3a888d7ef8a42471f269b91fea 100644 (file)
@@ -1720,8 +1720,8 @@ static int ftgmac100_setup_mdio(struct net_device *netdev)
        if (!priv->mii_bus)
                return -EIO;
 
-       if (of_device_is_compatible(np, "aspeed,ast2400-mac") ||
-           of_device_is_compatible(np, "aspeed,ast2500-mac")) {
+       if (priv->mac_id == FTGMAC100_AST2400 ||
+           priv->mac_id == FTGMAC100_AST2500) {
                /* The AST2600 has a separate MDIO controller */
 
                /* For the AST2400 and AST2500 this driver only supports the
@@ -1926,9 +1926,9 @@ static int ftgmac100_probe(struct platform_device *pdev)
        if (err)
                goto err_phy_connect;
 
-       if (np && (of_device_is_compatible(np, "aspeed,ast2400-mac") ||
-                  of_device_is_compatible(np, "aspeed,ast2500-mac") ||
-                  of_device_is_compatible(np, "aspeed,ast2600-mac"))) {
+       if (priv->mac_id == FTGMAC100_AST2400 ||
+           priv->mac_id == FTGMAC100_AST2500 ||
+           priv->mac_id == FTGMAC100_AST2600) {
                priv->rxdes0_edorr_mask = BIT(30);
                priv->txdes0_edotr_mask = BIT(30);
                priv->is_aspeed = true;
@@ -1973,8 +1973,8 @@ static int ftgmac100_probe(struct platform_device *pdev)
                 * available PHYs and register them.
                 */
                if (of_get_property(np, "phy-handle", NULL) &&
-                   (of_device_is_compatible(np, "aspeed,ast2400-mac") ||
-                    of_device_is_compatible(np, "aspeed,ast2500-mac"))) {
+                   (priv->mac_id == FTGMAC100_AST2400 ||
+                    priv->mac_id == FTGMAC100_AST2500)) {
                        err = ftgmac100_setup_mdio(netdev);
                        if (err)
                                goto err_setup_mdio;
@@ -2026,7 +2026,7 @@ static int ftgmac100_probe(struct platform_device *pdev)
                        goto err_phy_connect;
 
                /* Disable ast2600 problematic HW arbitration */
-               if (of_device_is_compatible(np, "aspeed,ast2600-mac"))
+               if (priv->mac_id == FTGMAC100_AST2600)
                        iowrite32(FTGMAC100_TM_DEFAULT,
                                  priv->base + FTGMAC100_OFFSET_TM);
        }
@@ -2044,11 +2044,11 @@ static int ftgmac100_probe(struct platform_device *pdev)
                netdev->hw_features |= NETIF_F_HW_VLAN_CTAG_FILTER;
 
        /* AST2400  doesn't have working HW checksum generation */
-       if (np && (of_device_is_compatible(np, "aspeed,ast2400-mac")))
+       if (priv->mac_id == FTGMAC100_AST2400)
                netdev->hw_features &= ~NETIF_F_HW_CSUM;
 
        /* AST2600 tx checksum with NCSI is broken */
-       if (priv->use_ncsi && of_device_is_compatible(np, "aspeed,ast2600-mac"))
+       if (priv->use_ncsi && priv->mac_id == FTGMAC100_AST2600)
                netdev->hw_features &= ~NETIF_F_HW_CSUM;
 
        if (np && of_get_property(np, "no-hw-checksum", NULL))