From patchwork Thu Sep 22 05:10:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 4236 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 1470623F6F for ; Thu, 22 Sep 2011 05:01:17 +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 093DBA1822F for ; Thu, 22 Sep 2011 05:01:17 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 23so3374950fxe.11 for ; Wed, 21 Sep 2011 22:01:17 -0700 (PDT) Received: by 10.223.33.19 with SMTP id f19mr2298061fad.122.1316667676929; Wed, 21 Sep 2011 22:01:16 -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 y6cs154644lad; Wed, 21 Sep 2011 22:01:16 -0700 (PDT) Received: by 10.52.22.116 with SMTP id c20mr1397867vdf.331.1316667675669; Wed, 21 Sep 2011 22:01:15 -0700 (PDT) Received: from TX2EHSOBE004.bigfish.com (tx2ehsobe002.messaging.microsoft.com. [65.55.88.12]) by mx.google.com with ESMTPS id el4si512137vdb.70.2011.09.21.22.01.15 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Sep 2011 22:01:15 -0700 (PDT) Received-SPF: neutral (google.com: 65.55.88.12 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=65.55.88.12; Authentication-Results: mx.google.com; spf=neutral (google.com: 65.55.88.12 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: from mail97-tx2-R.bigfish.com (10.9.14.250) by TX2EHSOBE004.bigfish.com (10.9.40.24) with Microsoft SMTP Server id 14.1.225.22; Thu, 22 Sep 2011 05:01:14 +0000 Received: from mail97-tx2 (localhost.localdomain [127.0.0.1]) by mail97-tx2-R.bigfish.com (Postfix) with ESMTP id 887975483E2; Thu, 22 Sep 2011 05:01:14 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h64h) X-Spam-TCS-SCL: 3:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail97-tx2 (localhost.localdomain [127.0.0.1]) by mail97-tx2 (MessageSwitch) id 1316667655672855_3246; Thu, 22 Sep 2011 05:00:55 +0000 (UTC) Received: from TX2EHSMHS039.bigfish.com (unknown [10.9.14.254]) by mail97-tx2.bigfish.com (Postfix) with ESMTP id 74D59BB8058; Thu, 22 Sep 2011 05:00:55 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS039.bigfish.com (10.9.99.139) with Microsoft SMTP Server (TLS) id 14.1.225.22; Thu, 22 Sep 2011 05:00:51 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server id 14.1.323.7; Thu, 22 Sep 2011 00:00:51 -0500 Received: from S2100-06.ap.freescale.net (S2100-06.ap.freescale.net [10.192.242.125]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p8M50kN6025656; Thu, 22 Sep 2011 00:00:49 -0500 (CDT) From: Shawn Guo To: "David S. Miller" CC: , , , Shawn Guo Subject: [PATCH v4 1/3] net/fec: fec_reset_phy() does not need to always succeed Date: Thu, 22 Sep 2011 13:10:16 +0800 Message-ID: <1316668218-10194-2-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1316668218-10194-1-git-send-email-shawn.guo@linaro.org> References: <1316668218-10194-1-git-send-email-shawn.guo@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com 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 Acked-by: Wolfram Sang --- 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 */