From: Quanyang Wang <[email protected]> This commit fixes compile issues as below: 1. Bring back the missing part of mainline commit c4934e65c8bc ("net: axienet: Fix probe error cleanup") to fix "no label" compile error. 2. Because of SDK commit 9262da1a1836 ("Revert "net: axienet: convert to phylink API""), delete modifications which are introduced by mainline commit 1a02556086fc ("net: axienet: Properly handle PCS/PMA PHY for 1000BaseX mode") and commit c4934e65c8bc ("net: axienet: Fix probe error cleanup") about phylink_config and phylink.
Signed-off-by: Quanyang Wang <[email protected]> --- drivers/net/ethernet/xilinx/xilinx_axienet.h | 3 --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 11 +++++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h index d81e68523436..10a8dc7590ac 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet.h +++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h @@ -761,9 +761,6 @@ struct axienet_local { /* Connection to PHY device */ struct device_node *phy_node; - struct phylink *phylink; - struct phylink_config phylink_config; - /* Reference to PCS/PMA PHY if used */ struct mdio_device *pcs_phy; diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index 68fd432bab5f..c44178f2dc1f 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -3542,7 +3542,6 @@ static int axienet_probe(struct platform_device *pdev) ret = -EPROBE_DEFER; goto cleanup_mdio; } - lp->phylink_config.pcs_poll = true; } #ifdef CONFIG_AXIENET_HAS_MCDMA @@ -3558,7 +3557,7 @@ static int axienet_probe(struct platform_device *pdev) if (ret) { dev_err(lp->dev, "register_netdev() error (%i)\n", ret); axienet_mdio_teardown(lp); - goto err_disable_clk; + goto cleanup_mdio; } #ifdef CONFIG_XILINX_TSN_PTP @@ -3590,10 +3589,18 @@ static int axienet_probe(struct platform_device *pdev) #endif return 0; +cleanup_mdio: + if (lp->pcs_phy) + put_device(&lp->pcs_phy->dev); + if (lp->mii_bus) + axienet_mdio_teardown(lp); + of_node_put(lp->phy_node); err_disable_clk: axienet_clk_disable(pdev); free_netdev: free_netdev(ndev); +cleanup_clk: + clk_disable_unprepare(lp->clk); return ret; } -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9682): https://lists.yoctoproject.org/g/linux-yocto/message/9682 Mute This Topic: https://lists.yoctoproject.org/mt/81880481/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
