On Mon, 2022-03-21 at 23:25 +0800, Andy Chiu wrote:
> 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@xxxxxxxxxx>
> Reviewed-by: Greentime Hu <greentime.hu@xxxxxxxxxx>
> ---
> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> index 6fd5157f0a6d..5d41b8de840a 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> @@ -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);
> - }
> + 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;
Reviewed-by: Robert Hancock <robert.hancock@xxxxxxxxxx>
--
Robert Hancock
Senior Hardware Designer, Calian Advanced Technologies
www.calian.com
