From patchwork Fri Sep 23 12:12:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 4300 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 971F523F57 for ; Fri, 23 Sep 2011 12:11:11 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 8BA6DA18638 for ; Fri, 23 Sep 2011 12:11:11 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 23so5220605fxe.11 for ; Fri, 23 Sep 2011 05:11:11 -0700 (PDT) Received: by 10.223.55.136 with SMTP id u8mr2087020fag.46.1316779871406; Fri, 23 Sep 2011 05:11:11 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.18.198 with SMTP id y6cs209116lad; Fri, 23 Sep 2011 05:11:11 -0700 (PDT) Received: by 10.236.191.198 with SMTP id g46mr20791248yhn.124.1316779870144; Fri, 23 Sep 2011 05:11:10 -0700 (PDT) Received: from mail-yw0-f50.google.com (mail-yw0-f50.google.com [209.85.213.50]) by mx.google.com with ESMTPS id o30si12868015yhn.127.2011.09.23.05.11.09 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Sep 2011 05:11:10 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.213.50 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.213.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.213.50 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by ywm13 with SMTP id 13so4155515ywm.37 for ; Fri, 23 Sep 2011 05:11:09 -0700 (PDT) Received: by 10.68.40.234 with SMTP id a10mr9840200pbl.120.1316779869299; Fri, 23 Sep 2011 05:11:09 -0700 (PDT) Received: from localhost.localdomain ([117.82.33.48]) by mx.google.com with ESMTPS id 2sm22135119pbu.1.2011.09.23.05.11.02 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Sep 2011 05:11:08 -0700 (PDT) From: Shawn Guo To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, patches@linaro.org, Shawn Guo Subject: [PATCH v5 1/3] net/fec: fec_reset_phy() does not need to always succeed Date: Fri, 23 Sep 2011 20:12:46 +0800 Message-Id: <1316779968-21390-2-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1316779968-21390-1-git-send-email-shawn.guo@linaro.org> References: <1316779968-21390-1-git-send-email-shawn.guo@linaro.org> FEC can work without a phy reset on some platforms, which means not very platform necessarily have a phy-reset gpio encoded in device tree. Even on the platforms that have the gpio, FEC can work without resetting phy for some cases, e.g. boot loader has done that. So it makes more sense to have the phy-reset-gpio request failure as a debug message rather than a warning, and get fec_reset_phy() return void since the caller does not check the return anyway. Signed-off-by: Shawn Guo --- drivers/net/ethernet/freescale/fec.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c index 158b82e..9c1d059 100644 --- a/drivers/net/ethernet/freescale/fec.c +++ b/drivers/net/ethernet/freescale/fec.c @@ -1411,24 +1411,22 @@ static int __devinit fec_get_phy_mode_dt(struct platform_device *pdev) return -ENODEV; } -static int __devinit fec_reset_phy(struct platform_device *pdev) +static void __devinit fec_reset_phy(struct platform_device *pdev) { int err, phy_reset; struct device_node *np = pdev->dev.of_node; if (!np) - return -ENODEV; + return; phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0); err = gpio_request_one(phy_reset, GPIOF_OUT_INIT_LOW, "phy-reset"); if (err) { - pr_warn("FEC: failed to get gpio phy-reset: %d\n", err); - return err; + pr_debug("FEC: failed to get gpio phy-reset: %d\n", err); + return; } msleep(1); gpio_set_value(phy_reset, 1); - - return 0; } #else /* CONFIG_OF */ static inline int fec_get_phy_mode_dt(struct platform_device *pdev) @@ -1436,13 +1434,12 @@ static inline int fec_get_phy_mode_dt(struct platform_device *pdev) return -ENODEV; } -static inline int fec_reset_phy(struct platform_device *pdev) +static inline void fec_reset_phy(struct platform_device *pdev) { /* * In case of platform probe, the reset has been done * by machine code. */ - return 0; } #endif /* CONFIG_OF */