UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: ks8851: Pass device node into ks8851_init_mac() 

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>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Marek Vasut 2020-05-29 00:21:31 +02:00 committed by David S. Miller
parent 2f3271c952
commit 848fc0ce6c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/micrel/ks8851.c
View File

@ -409,6 +409,7 @@ static void ks8851_read_mac_addr(struct net_device *dev)
/** /**
* ks8851_init_mac - initialise the mac address * ks8851_init_mac - initialise the mac address
* @ks: The device structure * @ks: The device structure
* @np: The device node pointer
* *
* Get or create the initial mac address for the device and then set that * 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 * 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() * we try that. If no valid mac address is found we use eth_random_addr()
* to create a new one. * 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; struct net_device *dev = ks->netdev;
const u8 *mac_addr; 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)) { if (!IS_ERR(mac_addr)) {
ether_addr_copy(dev->dev_addr, mac_addr); ether_addr_copy(dev->dev_addr, mac_addr);
ks8851_write_mac_addr(dev); 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); ks->rc_ccr = ks8851_rdreg16(ks, KS_CCR);
ks8851_read_selftest(ks); ks8851_read_selftest(ks);
ks8851_init_mac(ks); ks8851_init_mac(ks, dev->of_node);
ret = register_netdev(netdev); ret = register_netdev(netdev);
if (ret) { if (ret) {