Commit 4dbc8d6d authored by Jacky Chou's avatar Jacky Chou Committed by Jakub Kicinski
Browse files

net: ftgmac100: refactor getting phy device handle 



Consolidate the handling of dedicated PHY and fixed-link phy by taking
advantage of logic in of_phy_get_and_connect() which handles both of
these cases, rather than open coding the same logic in ftgmac100_probe().

Signed-off-by: default avatarJacky Chou <jacky_chou@aspeedtech.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20241022084214.1261174-1-jacky_chou@aspeedtech.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b6260787

drivers/net/ethernet/faraday/ftgmac100.c

+5 −23
Original line number Diff line number Diff line
@@ -1918,35 +1918,17 @@ static int ftgmac100_probe(struct platform_device *pdev) 
			dev_err(&pdev->dev, "Connecting PHY failed\n");

			goto err_phy_connect;

		}

	} else if (np && of_phy_is_fixed_link(np)) {

		struct phy_device *phy;



		err = of_phy_register_fixed_link(np);

		if (err) {

			dev_err(&pdev->dev, "Failed to register fixed PHY\n");

			goto err_phy_connect;

		}



		phy = of_phy_get_and_connect(priv->netdev, np,

					     &ftgmac100_adjust_link);

		if (!phy) {

			dev_err(&pdev->dev, "Failed to connect to fixed PHY\n");

			of_phy_deregister_fixed_link(np);

			err = -EINVAL;

			goto err_phy_connect;

		}



		/* Display what we found */

		phy_attached_info(phy);

	} else if (np && of_get_property(np, "phy-handle", NULL)) {

	} else if (np && (of_phy_is_fixed_link(np) ||

			  of_get_property(np, "phy-handle", NULL))) {

		struct phy_device *phy;



		/* Support "mdio"/"phy" child nodes for ast2400/2500 with

		 * an embedded MDIO controller. Automatically scan the DTS for

		 * available PHYs and register them.

		 */

		if (of_device_is_compatible(np, "aspeed,ast2400-mac") ||

		    of_device_is_compatible(np, "aspeed,ast2500-mac")) {

		if (of_get_property(np, "phy-handle", NULL) &&

		    (of_device_is_compatible(np, "aspeed,ast2400-mac") ||

		     of_device_is_compatible(np, "aspeed,ast2500-mac"))) {

			err = ftgmac100_setup_mdio(netdev);

			if (err)

				goto err_setup_mdio;