From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Sun, 27 Jan 2008 18:29:20 +0000 (-0800)
Subject: NET: convert the phy_device file to use bus_find_device_by_name
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~14853^2~5
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=26853ab6f9a4c482be4b638477335704724d4854;p=mirror_ubuntu-zesty-kernel.git

NET: convert the phy_device file to use bus_find_device_by_name

The driver core now has this helper function, so might as well use it
instead of forcing the phy code to roll their own version.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index f11e900b437b..e11b03b2b25a 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -309,11 +309,6 @@ void phy_disconnect(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(phy_disconnect);
 
-static int phy_compare_id(struct device *dev, void *data)
-{
-	return strcmp((char *)data, dev->bus_id) ? 0 : 1;
-}
-
 /**
  * phy_attach - attach a network device to a particular PHY device
  * @dev: network device to attach
@@ -337,8 +332,7 @@ struct phy_device *phy_attach(struct net_device *dev,
 
 	/* Search the list of PHY devices on the mdio bus for the
 	 * PHY with the requested name */
-	d = bus_find_device(bus, NULL, (void *)bus_id, phy_compare_id);
-
+	d = bus_find_device_by_name(bus, NULL, bus_id);
 	if (d) {
 		phydev = to_phy_device(d);
 	} else {