From: Marek Vasut <marex@denx.de>
To: netdev@vger.kernel.org
Cc: Marek Vasut <marex@denx.de>,
"David S . Miller" <davem@davemloft.net>,
Lukas Wunner <lukas@wunner.de>, Petr Stetiar <ynezz@true.cz>,
YueHaibing <yuehaibing@huawei.com>
Subject: [PATCH V2 04/14] net: ks8851: Pass device node into ks8851_init_mac()
Date: Wed, 25 Mar 2020 16:05:33 +0100 [thread overview]
Message-ID: <20200325150543.78569-5-marex@denx.de> (raw)
In-Reply-To: <20200325150543.78569-1-marex@denx.de>
Since the driver probe function already has a struct device *dev pointer
and can easily derive of_node pointer from it, pass the of_node pointer as
a parameter to ks8851_init_mac() to avoid fishing it out from ks->spidev.
This is the only reference to spidev in the function, so get rid of it.
This is done in preparation for unifying the KS8851 SPI and parallel bus
drivers.
No functional change.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Petr Stetiar <ynezz@true.cz>
Cc: YueHaibing <yuehaibing@huawei.com>
---
V2: Pass in of_node instead of the entire device pointer
---
drivers/net/ethernet/micrel/ks8851.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 0088df970ad6..942e694c750a 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -409,6 +409,7 @@ static void ks8851_read_mac_addr(struct net_device *dev)
/**
* ks8851_init_mac - initialise the mac address
* @ks: The device structure
+ * @ddev: The device structure pointer
*
* Get or create the initial mac address for the device and then set that
* into the station address register. A mac address supplied in the device
@@ -416,12 +417,12 @@ static void ks8851_read_mac_addr(struct net_device *dev)
* we try that. If no valid mac address is found we use eth_random_addr()
* to create a new one.
*/
-static void ks8851_init_mac(struct ks8851_net *ks)
+static void ks8851_init_mac(struct ks8851_net *ks, struct device_node *np)
{
struct net_device *dev = ks->netdev;
const u8 *mac_addr;
- mac_addr = of_get_mac_address(ks->spidev->dev.of_node);
+ mac_addr = of_get_mac_address(np);
if (!IS_ERR(mac_addr)) {
ether_addr_copy(dev->dev_addr, mac_addr);
ks8851_write_mac_addr(dev);
@@ -1541,7 +1542,7 @@ static int ks8851_probe(struct spi_device *spi)
ks->rc_ccr = ks8851_rdreg16(ks, KS_CCR);
ks8851_read_selftest(ks);
- ks8851_init_mac(ks);
+ ks8851_init_mac(ks, dev->of_node);
ret = register_netdev(netdev);
if (ret) {
--
2.25.1
next prev parent reply other threads:[~2020-03-25 15:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 15:05 [PATCH V2 00/14] net: ks8851: Unify KS8851 SPI and MLL drivers Marek Vasut
2020-03-25 15:05 ` [PATCH V2 01/14] net: ks8851: Factor out spi->dev in probe()/remove() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 02/14] net: ks8851: Rename ndev to netdev in probe Marek Vasut
2020-03-25 15:05 ` [PATCH V2 03/14] net: ks8851: Replace dev_err() with netdev_err() in IRQ handler Marek Vasut
2020-03-25 15:05 ` Marek Vasut [this message]
2020-03-25 15:05 ` [PATCH V2 05/14] net: ks8851: Use devm_alloc_etherdev() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 06/14] net: ks8851: Use dev_{get,set}_drvdata() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 07/14] net: ks8851: Remove ks8851_rdreg32() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 08/14] net: ks8851: Use 16-bit writes to program MAC address Marek Vasut
2020-03-25 16:56 ` Michal Kubecek
2020-03-25 17:05 ` Marek Vasut
2020-03-25 17:30 ` Michal Kubecek
2020-03-27 18:16 ` Marek Vasut
2020-03-25 15:05 ` [PATCH V2 09/14] net: ks8851: Use 16-bit read of RXFC register Marek Vasut
2020-03-25 15:05 ` [PATCH V2 10/14] net: ks8851: Split out SPI specific entries in struct ks8851_net Marek Vasut
2020-03-25 15:05 ` [PATCH V2 11/14] net: ks8851: Split out SPI specific code from probe() and remove() Marek Vasut
2020-03-25 15:05 ` [PATCH V2 12/14] net: ks8851: Separate SPI operations into separate file Marek Vasut
2020-03-25 15:05 ` [PATCH V2 13/14] net: ks8851: Implement Parallel bus operations Marek Vasut
2020-03-25 15:05 ` [PATCH V2 14/14] net: ks8851: Remove ks8851_mll.c Marek Vasut
2020-03-26 19:02 ` [PATCH V2 00/14] net: ks8851: Unify KS8851 SPI and MLL drivers Lukas Wunner
2020-03-27 18:18 ` Marek Vasut
2020-03-27 19:25 ` Marek Vasut
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=20200325150543.78569-5-marex@denx.de \
--to=marex@denx.de \
--cc=davem@davemloft.net \
--cc=lukas@wunner.de \
--cc=netdev@vger.kernel.org \
--cc=ynezz@true.cz \
--cc=yuehaibing@huawei.com \
/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).