From patchwork Mon Apr 27 15:36:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 26503 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id B9637B7063 for ; Tue, 28 Apr 2009 01:36:27 +1000 (EST) Received: by ozlabs.org (Postfix) id 3A690DDF5F; Tue, 28 Apr 2009 01:36:26 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id C4A93DDF3F for ; Tue, 28 Apr 2009 01:36:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755111AbZD0PgR (ORCPT ); Mon, 27 Apr 2009 11:36:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754525AbZD0PgR (ORCPT ); Mon, 27 Apr 2009 11:36:17 -0400 Received: from rv-out-0506.google.com ([209.85.198.227]:63049 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752906AbZD0PgQ (ORCPT ); Mon, 27 Apr 2009 11:36:16 -0400 Received: by rv-out-0506.google.com with SMTP id f9so1856328rvb.1 for ; Mon, 27 Apr 2009 08:36:16 -0700 (PDT) Received: by 10.141.20.7 with SMTP id x7mr1721023rvi.143.1240846576193; Mon, 27 Apr 2009 08:36:16 -0700 (PDT) Received: from trillian.cg.shawcable.net (S01060016b61d1226.cg.shawcable.net [68.146.92.145]) by mx.google.com with ESMTPS id f42sm8618187rvb.11.2009.04.27.08.36.15 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 27 Apr 2009 08:36:15 -0700 (PDT) Received: from localhost.localdomain (trillian [127.0.0.1]) by trillian.cg.shawcable.net (Postfix) with ESMTP id D3F01C8555; Mon, 27 Apr 2009 09:36:13 -0600 (MDT) 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> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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];