From patchwork Tue Oct 6 03:09:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 526622 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E0E5A14090A for ; Tue, 6 Oct 2015 14:51:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751916AbbJFDvO (ORCPT ); Mon, 5 Oct 2015 23:51:14 -0400 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:51545 "EHLO e23smtp01.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751517AbbJFDu5 (ORCPT ); Mon, 5 Oct 2015 23:50:57 -0400 Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 6 Oct 2015 13:50:54 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp01.au.ibm.com (202.81.31.207) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 6 Oct 2015 13:50:53 +1000 X-Helo: d23dlp02.au.ibm.com X-MailFrom: gwshan@linux.vnet.ibm.com X-RcptTo: netdev@vger.kernel.org Received: from d23relay07.au.ibm.com (d23relay07.au.ibm.com [9.190.26.37]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 87DFA2BB0052 for ; Tue, 6 Oct 2015 14:50:51 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t963oiwu50921536 for ; Tue, 6 Oct 2015 14:50:53 +1100 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t963oIuV029611 for ; Tue, 6 Oct 2015 14:50:19 +1100 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t963oIYT028835; Tue, 6 Oct 2015 14:50:18 +1100 Received: from bran.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) by ozlabs.au.ibm.com (Postfix) with ESMTP id 66F10A0282; Tue, 6 Oct 2015 14:49:54 +1100 (AEDT) Received: from gwshan (shangw.ozlabs.ibm.com [10.61.2.199]) by bran.ozlabs.ibm.com (Postfix) with ESMTP id 52523E460B; Tue, 6 Oct 2015 14:49:54 +1100 (AEDT) Received: by gwshan (Postfix, from userid 1000) id BFA369430CE; Tue, 6 Oct 2015 14:09:51 +1100 (AEDT) From: Gavin Shan To: netdev@vger.kernel.org Cc: benh@kernel.crashing.org, davem@davemloft.net, Gavin Shan Subject: [PATCH RFC v1 5/7] net/faraday: Replace use_nc_si with use_ncsi Date: Tue, 6 Oct 2015 14:09:47 +1100 Message-Id: <1444100989-3437-6-git-send-email-gwshan@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1444100989-3437-1-git-send-email-gwshan@linux.vnet.ibm.com> References: <1444100989-3437-1-git-send-email-gwshan@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15100603-1618-0000-0000-000002DDDC28 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The patch replaces variable name "use_nc_si" with "use_ncsi". No function changed. Signed-off-by: Gavin Shan --- drivers/net/ethernet/faraday/ftgmac100.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 08e0336..778bee8 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -75,7 +75,7 @@ struct ftgmac100 { struct phy_device *phydev; int old_speed; - bool use_nc_si; + bool use_ncsi; }; static int ftgmac100_alloc_rx_page(struct ftgmac100 *priv, @@ -1150,11 +1150,11 @@ static int ftgmac100_open(struct net_device *netdev) goto err_hw; ftgmac100_init_hw(priv); - ftgmac100_start_hw(priv, priv->use_nc_si ? 100 : 10); + ftgmac100_start_hw(priv, priv->use_ncsi ? 100 : 10); if (priv->phydev) phy_start(priv->phydev); - else if (priv->use_nc_si) + else if (priv->use_ncsi) netif_carrier_on(priv->netdev); napi_enable(&priv->napi); @@ -1275,7 +1275,7 @@ err_alloc_mdiobus: static void ftgmac100_destroy_mdio(struct ftgmac100 *priv) { - if (!priv->use_nc_si) + if (!priv->use_ncsi) return; phy_disconnect(priv->phydev); mdiobus_unregister(priv->mii_bus); @@ -1359,9 +1359,9 @@ static int ftgmac100_probe(struct platform_device *pdev) /* Check for NC-SI mode */ if (pdev->dev.of_node && of_get_property(pdev->dev.of_node, "use-nc-si", NULL)) - priv->use_nc_si = true; + priv->use_ncsi = true; else - priv->use_nc_si = false; + priv->use_ncsi = false; /* If we use NC-SI, we need to set that up, which isn't implemented yet * so we pray things were setup by the bootloader and just mark our link @@ -1370,7 +1370,7 @@ static int ftgmac100_probe(struct platform_device *pdev) * Eventually, we'll have a proper NC-SI stack as a helper we can * instanciate */ - if (priv->use_nc_si) { + if (priv->use_ncsi) { /* XXX */ priv->phydev = NULL; dev_info(&pdev->dev, "Using NC-SI interface\n");