From: Gavin Shan <gwshan@linux.vnet.ibm.com>
To: netdev@vger.kernel.org
Cc: benh@kernel.crashing.org, davem@davemloft.net,
Gavin Shan <gwshan@linux.vnet.ibm.com>
Subject: [PATCH RFC v1 5/7] net/faraday: Replace use_nc_si with use_ncsi
Date: Tue, 6 Oct 2015 14:09:47 +1100 [thread overview]
Message-ID: <1444100989-3437-6-git-send-email-gwshan@linux.vnet.ibm.com> (raw)
In-Reply-To: <1444100989-3437-1-git-send-email-gwshan@linux.vnet.ibm.com>
The patch replaces variable name "use_nc_si" with "use_ncsi". No
function changed.
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
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
next prev parent reply other threads:[~2015-10-06 3:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-06 3:09 [PATCH RFC v1 0/7] NCSI Support Gavin Shan
2015-10-06 3:09 ` [PATCH RFC v1 1/7] net/ncsi: Resource management Gavin Shan
2015-10-06 3:09 ` [PATCH RFC v1 2/7] net/ncsi: Packet handler Gavin Shan
2015-10-06 3:09 ` [PATCH RFC v1 3/7] net/ncsi: Manage NCSI device Gavin Shan
2015-10-06 3:09 ` [PATCH RFC v1 4/7] net/ncsi: Netlink support Gavin Shan
2015-10-06 3:09 ` Gavin Shan [this message]
2015-10-06 3:09 ` [PATCH RFC v1 6/7] net/faraday: Enable NCSI interface Gavin Shan
2015-10-06 3:09 ` [PATCH RFC v1 7/7] net/faraday: Enable offload checksum according to device-tree Gavin Shan
2015-10-06 14:19 ` Sergei Shtylyov
2015-10-06 23:19 ` Gavin Shan
2015-10-06 23:03 ` [PATCH RFC v1 0/7] NCSI Support Gavin Shan
2015-11-09 0:12 ` Gavin Shan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444100989-3437-6-git-send-email-gwshan@linux.vnet.ibm.com \
--to=gwshan@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).