Commit 7ac5ddde authored by Jacky Chou's avatar Jacky Chou Committed by Paolo Abeni
Browse files

net: ftgmac100: Use devm_mdiobus_alloc/devm_of_mdiobus_register 



Make use of devm_ methods to allocate and register mdiobus to simplify
cleanup.

Signed-off-by: default avatarJacky Chou <jacky_chou@aspeedtech.com>
Link: https://patch.msgid.link/20260206-ftgmac-cleanup-v5-15-ad28a9067ea7@aspeedtech.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 201dddf6

drivers/net/ethernet/faraday/ftgmac100.c

+4 −22
Original line number Diff line number Diff line
@@ -1721,7 +1721,7 @@ static int ftgmac100_setup_mdio(struct net_device *netdev) 
	u32 reg;



	/* initialize mdio bus */

	priv->mii_bus = mdiobus_alloc();

	priv->mii_bus = devm_mdiobus_alloc(priv->dev);

	if (!priv->mii_bus)

		return -EIO;
@@ -1747,19 +1747,14 @@ static int ftgmac100_setup_mdio(struct net_device *netdev) 


	mdio_np = of_get_child_by_name(np, "mdio");



	err = of_mdiobus_register(priv->mii_bus, mdio_np);

	err = devm_of_mdiobus_register(priv->dev, priv->mii_bus, mdio_np);

	of_node_put(mdio_np);

	if (err) {

		dev_err(priv->dev, "Cannot register MDIO bus!\n");

		goto err_register_mdiobus;

		return err;

	}



	of_node_put(mdio_np);



	return 0;



err_register_mdiobus:

	mdiobus_free(priv->mii_bus);

	return err;

}



static void ftgmac100_phy_disconnect(struct net_device *netdev)
@@ -1778,17 +1773,6 @@ static void ftgmac100_phy_disconnect(struct net_device *netdev) 
		fixed_phy_unregister(phydev);

}



static void ftgmac100_destroy_mdio(struct net_device *netdev)

{

	struct ftgmac100 *priv = netdev_priv(netdev);



	if (!priv->mii_bus)

		return;



	mdiobus_unregister(priv->mii_bus);

	mdiobus_free(priv->mii_bus);

}



static void ftgmac100_ncsi_handler(struct ncsi_dev *nd)

{

	if (unlikely(nd->state != ncsi_dev_state_functional))
@@ -2092,7 +2076,6 @@ static int ftgmac100_probe(struct platform_device *pdev) 
	ftgmac100_phy_disconnect(netdev);

	if (priv->ndev)

		ncsi_unregister_dev(priv->ndev);

	ftgmac100_destroy_mdio(netdev);

	return err;

}
@@ -2114,7 +2097,6 @@ static void ftgmac100_remove(struct platform_device *pdev) 
	cancel_work_sync(&priv->reset_task);



	ftgmac100_phy_disconnect(netdev);

	ftgmac100_destroy_mdio(netdev);

}



static const struct ftgmac100_match_data ftgmac100_match_data_ast2400 = {