On Mon, 2022-03-21 at 23:25 +0800, Andy Chiu wrote:
> the struct member `phy_node` of struct axienet_local is not used by the
> driver anymore after initialization. It might be a remnent of old code
> and could be removed.
>
> Signed-off-by: Andy Chiu <andy.chiu@xxxxxxxxxx>
> Reviewed-by: Greentime Hu <greentime.hu@xxxxxxxxxx>
> ---
> drivers/net/ethernet/xilinx/xilinx_axienet.h | 2 --
> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 13 +++++--------
> 2 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h
> b/drivers/net/ethernet/xilinx/xilinx_axienet.h
> index 0f9c88dd1a4a..d5c1e5c4a508 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet.h
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h
> @@ -433,8 +433,6 @@ struct axienet_local {
> struct net_device *ndev;
> struct device *dev;
>
> - struct device_node *phy_node;
> -
> struct phylink *phylink;
> struct phylink_config phylink_config;
>
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> index 5d41b8de840a..496a9227e760 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> @@ -2071,19 +2071,21 @@ static int axienet_probe(struct platform_device
> *pdev)
>
> 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) {
> + np = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);
> + if (!np) {
> dev_err(&pdev->dev, "phy-handle required for
> 1000BaseX/SGMII\n");
> ret = -EINVAL;
> goto cleanup_mdio;
> }
> - lp->pcs_phy = of_mdio_find_device(lp->phy_node);
> + lp->pcs_phy = of_mdio_find_device(np);
> if (!lp->pcs_phy) {
> ret = -EPROBE_DEFER;
> + of_node_put(np);
> goto cleanup_mdio;
> }
> lp->pcs.ops = &axienet_pcs_ops;
> lp->pcs.poll = true;
> + of_node_put(np);
> }
>
> lp->phylink_config.dev = &ndev->dev;
> @@ -2124,8 +2126,6 @@ static int axienet_probe(struct platform_device *pdev)
> put_device(&lp->pcs_phy->dev);
> if (lp->mii_bus)
> axienet_mdio_teardown(lp);
> - of_node_put(lp->phy_node);
> -
> cleanup_clk:
> clk_bulk_disable_unprepare(XAE_NUM_MISC_CLOCKS, lp->misc_clks);
> clk_disable_unprepare(lp->axi_clk);
> @@ -2154,9 +2154,6 @@ static int axienet_remove(struct platform_device *pdev)
> clk_bulk_disable_unprepare(XAE_NUM_MISC_CLOCKS, lp->misc_clks);
> clk_disable_unprepare(lp->axi_clk);
>
> - of_node_put(lp->phy_node);
> - lp->phy_node = NULL;
> -
> free_netdev(ndev);
>
> return 0;
Reviewed-by: Robert Hancock <robert.hancock@xxxxxxxxxx>
--
Robert Hancock
Senior Hardware Designer, Calian Advanced Technologies
www.calian.com
