From patchwork Wed Dec 23 00:36:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "David Rivshin (Allworx)" X-Patchwork-Id: 7908371 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3B77DBEEED for ; Wed, 23 Dec 2015 00:39:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 741B62039E for ; Wed, 23 Dec 2015 00:39:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 82982203B1 for ; Wed, 23 Dec 2015 00:39:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756053AbbLWAiu (ORCPT ); Tue, 22 Dec 2015 19:38:50 -0500 Received: from mail-qg0-f51.google.com ([209.85.192.51]:36065 "EHLO mail-qg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933526AbbLWAig (ORCPT ); Tue, 22 Dec 2015 19:38:36 -0500 Received: by mail-qg0-f51.google.com with SMTP id c96so123183037qgd.3; Tue, 22 Dec 2015 16:38:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=64aC6IcmRo/lzb2FKkrnbGyGMIKOb5ALqyLT4gxSmrA=; b=Msd0r03c4UUujQkCM4SOHPnpseVwfxO3XsjSSRGjhQGcsY7LBfyGEcjsu5u5WAu5Rv 3zcNU1vvtQeFYKPVWBoeyvp3R1HirNkXvSHgBS99ru3rPo5ApPny9lE7VoA7tEgyoZ+3 6mz3aQzmxkkDs536vanSFfaWYM2kQGQ+Kl0Cl0qkSQW71maVnMwD80B8f15u/Ux/0r/Y 3PKZUosD03DwLwbJywd6hTbQjOXXycLdBj6+f3hAUciPWOwzvrORUQclOMv95RvZwKEW mUsookSSsy0I2okEJmgUir0u9EpYOPKHf82ueUZD2ADMVZcyRy16sk2rjAdCyunp1hmw nXtg== X-Received: by 10.140.153.73 with SMTP id 70mr39407159qhz.30.1450831114716; Tue, 22 Dec 2015 16:38:34 -0800 (PST) Received: from drivshin-linux.crosskeys.inscitek.com ([24.213.148.66]) by smtp.gmail.com with ESMTPSA id i45sm17064680qgd.3.2015.12.22.16.38.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Dec 2015 16:38:34 -0800 (PST) From: "David Rivshin (Allworx)" To: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, devicetree@vger.kernel.org, David Miller , Heiko Schocher , Mugunthan V N , Markus Brunner , Pascal Speck , Daniel Trautmann Subject: [PATCH 3/3] drivers: net: cpsw: use of_phy_connect() in fixed-link case Date: Tue, 22 Dec 2015 19:36:34 -0500 Message-Id: <1450830994-5450-4-git-send-email-drivshin.allworx@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1450830994-5450-1-git-send-email-drivshin.allworx@gmail.com> References: <1450830994-5450-1-git-send-email-drivshin.allworx@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Rivshin If a fixed-link DT subnode is used, the phy_device was looked up so that a PHY ID string could be constructed and passed to phy_connect(). This is not necessary, as the device_node can be passed directly to of_phy_connect() instead. This reuses the same codepath as if the phy-handle DT property was used. Signed-off-by: David Rivshin --- drivers/net/ethernet/ti/cpsw.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index f9029e7..94b818c 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2038,29 +2038,21 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, "phy-handle", 0); parp = of_get_property(slave_node, "phy_id", &lenp); if (slave_data->phy_node) { dev_dbg(&pdev->dev, "slave[%d] using phy-handle=\"%s\"\n", i, slave_data->phy_node->full_name); } else if (of_phy_is_fixed_link(slave_node)) { - struct device_node *phy_node; - struct phy_device *phy_dev; - /* In the case of a fixed PHY, the DT node associated * to the PHY is the Ethernet MAC DT node. */ ret = of_phy_register_fixed_link(slave_node); if (ret) return ret; - phy_node = of_node_get(slave_node); - phy_dev = of_phy_find_device(phy_node); - if (!phy_dev) - return -ENODEV; - snprintf(slave_data->phy_id, sizeof(slave_data->phy_id), - PHY_ID_FMT, phy_dev->bus->id, phy_dev->addr); + slave_data->phy_node = of_node_get(slave_node); } else if (parp) { u32 phyid; struct device_node *mdio_node; struct platform_device *mdio; if (lenp != (sizeof(__be32) * 2)) { dev_err(&pdev->dev, "Invalid slave[%d] phy_id property\n", i);