From ddcc5b77c5086ca1fbeba7d2b8e022a2fc80193e Mon Sep 17 00:00:00 2001
From: Jonas Bonn <jonas@southpole.se>
Date: Fri, 11 Jun 2010 02:47:37 +0000
Subject: [PATCH] --- yaml --- r: 202899 b: refs/heads/master c:
 637f33b80d774060646772a22fd728e198d9ebf9 h: refs/heads/master i:   202897:
 2b9586ef6b7e0db83b0672d63019751607612de2   202895:
 efbe555b2c97fef09b4a39b351b212fed00fc866 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/net/ethoc.c | 24 ++++++++----------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 4e3235c620bc..f081c59c4cd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee4f56b990391f0ea333121ebc0e9fba28619b52
+refs/heads/master: 637f33b80d774060646772a22fd728e198d9ebf9
diff --git a/trunk/drivers/net/ethoc.c b/trunk/drivers/net/ethoc.c
index afeb9938ff85..1ee9947924d8 100644
--- a/trunk/drivers/net/ethoc.c
+++ b/trunk/drivers/net/ethoc.c
@@ -635,21 +635,13 @@ static int ethoc_mdio_probe(struct net_device *dev)
 {
 	struct ethoc *priv = netdev_priv(dev);
 	struct phy_device *phy;
+	int err;
 	int i;
 
-	for (i = 0; i < PHY_MAX_ADDR; i++) {
-		phy = priv->mdio->phy_map[i];
-		if (phy) {
-			if (priv->phy_id != -1) {
-				/* attach to specified PHY */
-				if (priv->phy_id == phy->addr)
-					break;
-			} else {
-				/* autoselect PHY if none was specified */
-				if (phy->addr != 0)
-					break;
-			}
-		}
+	if (priv->phy_id != -1) {
+		phy = priv->mdio->phy_map[priv->phy_id];
+	} else {
+		phy = phy_find_first(priv->mdio);
 	}
 
 	if (!phy) {
@@ -657,11 +649,11 @@ static int ethoc_mdio_probe(struct net_device *dev)
 		return -ENXIO;
 	}
 
-	phy = phy_connect(dev, dev_name(&phy->dev), ethoc_mdio_poll, 0,
+	err = phy_connect_direct(dev, phy, ethoc_mdio_poll, 0,
 			PHY_INTERFACE_MODE_GMII);
-	if (IS_ERR(phy)) {
+	if (err) {
 		dev_err(&dev->dev, "could not attach to PHY\n");
-		return PTR_ERR(phy);
+		return err;
 	}
 
 	priv->phy = phy;