Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3243ff2a authored by Lukas Wunner's avatar Lukas Wunner Committed by David S. Miller
Browse files

net: ethernet: davinci_emac: Deduplicate bus_find_device() by name matching 



No need to reinvent the wheel, we have bus_find_device_by_name().

Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 87de0838

drivers/net/ethernet/ti/davinci_emac.c

+2 −7
Original line number Diff line number Diff line
@@ -1385,11 +1385,6 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd) 
		return -EOPNOTSUPP;

}



static int match_first_device(struct device *dev, void *data)

{

	return !strncmp(dev_name(dev), "davinci_mdio", 12);

}



/**

 * emac_dev_open - EMAC device open

 * @ndev: The DaVinci EMAC network adapter
@@ -1489,8 +1484,8 @@ static int emac_dev_open(struct net_device *ndev) 


	/* use the first phy on the bus if pdata did not give us a phy id */

	if (!phydev && !priv->phy_id) {

		phy = bus_find_device(&mdio_bus_type, NULL, NULL,

				      match_first_device);

		phy = bus_find_device_by_name(&mdio_bus_type, NULL,

					      "davinci_mdio");

		if (phy) {

			priv->phy_id = dev_name(phy);

			if (!priv->phy_id || !*priv->phy_id)