From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rv-out-0506.google.com (rv-out-0506.google.com [209.85.198.236]) by ozlabs.org (Postfix) with ESMTP id BF5FCDDD0B for ; Tue, 28 Apr 2009 01:36:17 +1000 (EST) Received: by rv-out-0506.google.com with SMTP id f9so1638029rvb.9 for ; Mon, 27 Apr 2009 08:36:16 -0700 (PDT) Sender: Grant Likely From: Grant Likely Subject: [PATCH] net: Fix ucc_geth.c handling of phy 'interface' property. To: Joakim Tjernlund , Andy Fleming , Benjamin Herrenschmidt , David Miller , linuxppc-dev@ozlabs.org, netdev@vger.kernel.org Date: Mon, 27 Apr 2009 09:36:13 -0600 Message-ID: <20090427153612.5108.10877.stgit@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Grant Likely Previous rework to ucc_geth.c to add of_mdio support (net: Rework ucc_geth driver to use of_mdio infrastructure) added a block of code which broke older openfirmware device trees which use an 'interface' property in the phy node to describe the connection between the MAC and the PHY. This patch removes the offending blurb. Signed-off-by: Grant Likely --- drivers/net/ucc_geth.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 195b490..d805d60 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c @@ -3639,9 +3639,6 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma prop = of_get_property(np, "phy-connection-type", NULL); if (!prop) { /* handle interface property present in old trees */ - if (!phy) - return -ENODEV; - prop = of_get_property(phy, "interface", NULL); if (prop != NULL) { phy_interface = enet_to_phy_interface[*prop];