From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gavin Shan Subject: [PATCH RFC 4/6] net/faraday: Replace use_nc_si with use_ncsi Date: Mon, 9 Nov 2015 11:10:04 +1100 Message-ID: <1447027806-4744-5-git-send-email-gwshan@linux.vnet.ibm.com> References: <1447027806-4744-1-git-send-email-gwshan@linux.vnet.ibm.com> Cc: benh@kernel.crashing.org, davem@davemloft.net, sergei.shtylyov@cogentembedded.com, Gavin Shan To: netdev@vger.kernel.org Return-path: Received: from e23smtp07.au.ibm.com ([202.81.31.140]:43077 "EHLO e23smtp07.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752013AbbKIALp (ORCPT ); Sun, 8 Nov 2015 19:11:45 -0500 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 9 Nov 2015 10:11:43 +1000 Received: from d23relay07.au.ibm.com (d23relay07.au.ibm.com [9.190.26.37]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 861F63578055 for ; Mon, 9 Nov 2015 11:11:40 +1100 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tA90BYrS23527518 for ; Mon, 9 Nov 2015 11:11:42 +1100 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tA90B7wR017867 for ; Mon, 9 Nov 2015 11:11:08 +1100 In-Reply-To: <1447027806-4744-1-git-send-email-gwshan@linux.vnet.ibm.com> Sender: netdev-owner@vger.kernel.org List-ID: This replaces variable name "use_nc_si" with "use_ncsi". No logical changes introduced. 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"); -- 2.1.0