aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Marginean2019-11-25 17:15:11 +0200
committerJoe Hershberger2019-12-09 09:47:43 -0600
commita5d32c37d9eec2f819273536a5600a0fbde09acb (patch)
treeb5baa429e020e0e8ed89961226b248d2ec062a71
parent16cdc2daa07986243751a9f545aa287c60e04ced (diff)
net: mdio-uclass: rename arguments of dm_mdio_phy_connect for clarity
Renamed dm_mdio_phy_connect arguments dev to mdiodev and addr to phyaddr for a bit more clarity and consistency with the following patches. Also use NULL instead of 0 on error return path. Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
-rw-r--r--include/miiphy.h6
-rw-r--r--net/mdio-uclass.c10
2 files changed, 8 insertions, 8 deletions
diff --git a/include/miiphy.h b/include/miiphy.h
index 9b97d09f186..94bf0da24a0 100644
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -154,14 +154,14 @@ void dm_mdio_probe_devices(void);
/**
* dm_mdio_phy_connect - Wrapper over phy_connect for DM MDIO
*
- * @dev: mdio dev
- * @addr: PHY address on MDIO bus
+ * @mdiodev: mdio device the PHY is accesible on
+ * @phyaddr: PHY address on MDIO bus
* @ethdev: ethernet device to connect to the PHY
* @interface: MAC-PHY protocol
*
* @return pointer to phy_device, or 0 on error
*/
-struct phy_device *dm_mdio_phy_connect(struct udevice *dev, int addr,
+struct phy_device *dm_mdio_phy_connect(struct udevice *mdiodev, int phyaddr,
struct udevice *ethdev,
phy_interface_t interface);
diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c
index 6f922e80b6f..7a5f1d6dcc8 100644
--- a/net/mdio-uclass.c
+++ b/net/mdio-uclass.c
@@ -104,16 +104,16 @@ static int dm_mdio_pre_remove(struct udevice *dev)
return 0;
}
-struct phy_device *dm_mdio_phy_connect(struct udevice *dev, int addr,
+struct phy_device *dm_mdio_phy_connect(struct udevice *mdiodev, int phyaddr,
struct udevice *ethdev,
phy_interface_t interface)
{
- struct mdio_perdev_priv *pdata = dev_get_uclass_priv(dev);
+ struct mdio_perdev_priv *pdata = dev_get_uclass_priv(mdiodev);
- if (device_probe(dev))
- return 0;
+ if (device_probe(mdiodev))
+ return NULL;
- return phy_connect(pdata->mii_bus, addr, ethdev, interface);
+ return phy_connect(pdata->mii_bus, phyaddr, ethdev, interface);
}
UCLASS_DRIVER(mdio) = {