Commit d1c4f93e authored by Andy Chiu's avatar Andy Chiu Committed by David S. Miller
Browse files

net: axienet: setup mdio unconditionally 



The call to axienet_mdio_setup should not depend on whether "phy-node"
pressents on the DT. Besides, since `lp->phy_node` is used if PHY is in
SGMII or 100Base-X modes, move it into the if statement. And the next patch
will remove `lp->phy_node` from driver's private structure and do an
of_node_put on it right away after use since it is not used elsewhere.

Signed-off-by: default avatarAndy Chiu <andy.chiu@sifive.com>
Reviewed-by: default avatarGreentime Hu <greentime.hu@sifive.com>
Reviewed-by: default avatarRobert Hancock <robert.hancock@calian.com>
Reviewed-by: default avatarRadhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fb5833d8

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+6 −7
Original line number Diff line number Diff line
@@ -2064,15 +2064,14 @@ static int axienet_probe(struct platform_device *pdev) 
	if (ret)

		goto cleanup_clk;



	lp->phy_node = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);

	if (lp->phy_node) {

	ret = axienet_mdio_setup(lp);

	if (ret)

		dev_warn(&pdev->dev,

			 "error registering MDIO bus: %d\n", ret);

	}



	if (lp->phy_mode == PHY_INTERFACE_MODE_SGMII ||

	    lp->phy_mode == PHY_INTERFACE_MODE_1000BASEX) {

		lp->phy_node = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);

		if (!lp->phy_node) {

			dev_err(&pdev->dev, "phy-handle required for 1000BaseX/SGMII\n");

			ret = -EINVAL;