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

net: axienet: factor out phy_node in struct axienet_local 



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: 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 d1c4f93e

drivers/net/ethernet/xilinx/xilinx_axienet.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+5 −8
Original line number Diff line number Diff line
@@ -2071,17 +2071,19 @@ 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;

		}

		of_node_put(np);

		lp->pcs.ops = &axienet_pcs_ops;

		lp->pcs.poll = true;

	}
@@ -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;