xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: axienet: setup mdio unconditionally

Browse Source 
[ Upstream commit d1c4f93e3f0a023024a6f022a61528c06cf1daa9 ]

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: Andy Chiu <andy.chiu@sifive.com>
Reviewed-by: Greentime Hu <greentime.hu@sifive.com>
Reviewed-by: Robert Hancock <robert.hancock@calian.com>
Reviewed-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Andy Chiu
2022-04-05 17:19:26 +08:00
committed by Greg Kroah-Hartman
parent b643807a73
commit 9c12fcf1d8
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
View File

@@ -2060,15 +2060,14 @@ static int axienet_probe(struct platform_device *pdev)
if (ret) if (ret)
goto cleanup_clk; 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); ret = axienet_mdio_setup(lp);
if (ret) if (ret)
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"error registering MDIO bus: %d\n", ret); "error registering MDIO bus: %d\n", ret);
}
if (lp->phy_mode == PHY_INTERFACE_MODE_SGMII || if (lp->phy_mode == PHY_INTERFACE_MODE_SGMII ||
lp->phy_mode == PHY_INTERFACE_MODE_1000BASEX) { lp->phy_mode == PHY_INTERFACE_MODE_1000BASEX) {
lp->phy_node = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);
if (!lp->phy_node) { if (!lp->phy_node) {
dev_err(&pdev->dev, "phy-handle required for 1000BaseX/SGMII\n"); dev_err(&pdev->dev, "phy-handle required for 1000BaseX/SGMII\n");
ret = -EINVAL; ret = -EINVAL;