From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: netdev@vger.kernel.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [PATCH 05/10] ftgmac100: Rename ftgmac100_set_mac to ftgmac100_write_mac_addr
Date: Tue, 11 Apr 2017 11:04:31 +1000 [thread overview]
Message-ID: <20170411010436.23290-6-benh@kernel.crashing.org> (raw)
In-Reply-To: <20170411010436.23290-1-benh@kernel.crashing.org>
To avoid confusion with the ndo callback and generally be
clearer about the purpose of that function
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
drivers/net/ethernet/faraday/ftgmac100.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 257243a..c2053e5 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -173,7 +173,7 @@ static int ftgmac100_reset_and_config_mac(struct ftgmac100 *priv)
return ftgmac100_reset_mac(priv, maccr);
}
-static void ftgmac100_set_mac(struct ftgmac100 *priv, const unsigned char *mac)
+static void ftgmac100_write_mac_addr(struct ftgmac100 *priv, const u8 *mac)
{
unsigned int maddr = mac[0] << 8 | mac[1];
unsigned int laddr = mac[2] << 24 | mac[3] << 16 | mac[4] << 8 | mac[5];
@@ -226,7 +226,7 @@ static int ftgmac100_set_mac_addr(struct net_device *dev, void *p)
return ret;
eth_commit_mac_addr_change(dev, p);
- ftgmac100_set_mac(netdev_priv(dev), dev->dev_addr);
+ ftgmac100_write_mac_addr(netdev_priv(dev), dev->dev_addr);
return 0;
}
@@ -245,7 +245,7 @@ static void ftgmac100_init_hw(struct ftgmac100 *priv)
iowrite32(FTGMAC100_APTC_RXPOLL_CNT(1), priv->base + FTGMAC100_OFFSET_APTC);
- ftgmac100_set_mac(priv, priv->netdev->dev_addr);
+ ftgmac100_write_mac_addr(priv, priv->netdev->dev_addr);
}
static void ftgmac100_start_hw(struct ftgmac100 *priv)
--
2.9.3
next prev parent reply other threads:[~2017-04-11 1:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-11 1:04 [PATCH 00/10] ftgmac100: Rework batch 4 - Misc Benjamin Herrenschmidt
2017-04-11 1:04 ` [PATCH 01/10] ftgmac100: Upgrade to NETIF_F_HW_CSUM Benjamin Herrenschmidt
2017-04-11 10:57 ` Sergei Shtylyov
2017-04-11 11:13 ` Benjamin Herrenschmidt
2017-04-11 13:50 ` Benjamin Herrenschmidt
2017-04-11 15:27 ` David Miller
2017-04-11 22:06 ` Benjamin Herrenschmidt
2017-04-11 23:36 ` Benjamin Herrenschmidt
2017-04-12 0:03 ` David Miller
2017-04-12 0:08 ` Benjamin Herrenschmidt
2017-04-11 1:04 ` [PATCH 02/10] ftgmac100: Use device "compatible" property, not machine Benjamin Herrenschmidt
2017-04-11 1:04 ` [PATCH 03/10] ftgmac100: Disable HW checksum generation on AST2400, enable on others Benjamin Herrenschmidt
2017-04-11 1:04 ` [PATCH 04/10] ftgmac100: Set netdev->hw_features Benjamin Herrenschmidt
2017-04-11 1:04 ` Benjamin Herrenschmidt [this message]
2017-04-11 1:04 ` [PATCH 06/10] ftgmac100: Rename ftgmac100_setup_mac to ftgmac100_initial_mac Benjamin Herrenschmidt
2017-04-11 1:04 ` [PATCH 07/10] ftgmac100: Open code remaining register writes Benjamin Herrenschmidt
2017-04-11 1:04 ` [PATCH 08/10] ftgmac100: Add more register inits in ftgmac100_init_hw() Benjamin Herrenschmidt
2017-04-11 1:04 ` [PATCH 09/10] ftgmac100: Make ring sizes configurable via ethtool Benjamin Herrenschmidt
2017-04-11 1:04 ` [PATCH 10/10] ftgmac100: Set default ring sizes to 128 entries Benjamin Herrenschmidt
2017-04-11 1:08 ` [PATCH 00/10] ftgmac100: Rework batch 4 - Misc Benjamin Herrenschmidt
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=20170411010436.23290-6-benh@kernel.crashing.org \
--to=benh@kernel.crashing.org \
--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).