net: ftgmac100: reduce calls to of_device_is_compatible()
Subsystems (2)
PATCH 1/1 net: ftgmac100: reduce calls to of_device_is_compatible()
ftgmac100_probe() calls of_device_is_compatible() with the same arguments multiple times.
Just call of_device_is_compatible() once for each variant, save the result into a local variable and use the variable instead.
---
I am looking through callers to of_device_is_compatible() and noticed this. I have build tested but I don't have this hardware so I haven't tested if it works or not. I don't see why it wouldn't. This only saves 8 bytes of code in my build so its not massive but I think the code makes more sense after this.
drivers/net/ethernet/faraday/ftgmac100.c | 25 ++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
drivers/net/ethernet/faraday/ftgmac100.c +15 -10
@@ -1840,7 +1840,10 @@ static int ftgmac100_probe(struct platform_device *pdev)struct net_device *netdev;struct phy_device *phydev;struct ftgmac100 *priv; -struct device_node *np; +struct device_node *np = pdev->dev.of_node; +bool is_ast2400 = false; +bool is_ast2500 = false; +bool is_ast2600 = false;int err =0 ; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -1900,10 +1903,13 @@ static int ftgmac100_probe(struct platform_device *pdev)if (err) goto err_phy_connect; - np = pdev->dev.of_node; -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 (np) { + is_ast2400 =of_device_is_compatible (np,"aspeed,ast2400-mac" ); + is_ast2500 = !is_ast2400 &&of_device_is_compatible (np,"aspeed,ast2500-mac" ); + is_ast2600 = !is_ast2500 &&of_device_is_compatible (np,"aspeed,ast2600-mac" ); + } + +if (is_ast2400 || is_ast2500 || is_ast2600) { priv->rxdes0_edorr_mask =BIT (30 ); priv->txdes0_edotr_mask =BIT (30 ); priv->is_aspeed = true;
@@ -1948,8 +1954,7 @@ 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" ))) { + (is_ast2400 || is_ast2500)) { err =ftgmac100_setup_mdio (netdev);if (err) goto err_setup_mdio;
@@ -2001,7 +2006,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 (is_ast2600)iowrite32 (FTGMAC100_TM_DEFAULT , priv->base +FTGMAC100_OFFSET_TM ); }
@@ -2019,11 +2024,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 (is_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 && is_ast2600) netdev->hw_features &= ~NETIF_F_HW_CSUM ;if (np &&of_get_property (np,"no-hw-checksum" ,NULL ))
Signature · 1 line
2.51.0
Quoted 2 lines · Daniel Palmer
ftgmac100_probe()callsof_device_is_compatible()with the same arguments multiple times.
Please take a look at https://www.spinics.net/lists/netdev/msg1145959.html
Andrew
---
pw-bot: cr