Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da90e380 authored by Tobias Klauser's avatar Tobias Klauser Committed by David S. Miller
Browse files

net: axienet: Utilize of_get_mac_address() 



Do not open code getting the MAC address exclusively from the
"local-mac-address" property, but instead use of_get_mac_address()
which looks up the MAC address using the 3 typical property names.

Also avoid casting away the const qualifier of the return value by
making axienet_set_mac_address() take a const void* address.

Follows commit b34296a9 ("net: ethoc: Utilize
of_get_mac_address()").

Cc: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b7b707a

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+7 −6
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/module.h>

#include <linux/netdevice.h>

#include <linux/of_mdio.h>

#include <linux/of_net.h>

#include <linux/of_platform.h>

#include <linux/of_irq.h>

#include <linux/of_address.h>
@@ -292,7 +293,8 @@ static int axienet_dma_bd_init(struct net_device *ndev) 
 * This function is called to initialize the MAC address of the Axi Ethernet

 * core. It writes to the UAW0 and UAW1 registers of the core.

 */

static void axienet_set_mac_address(struct net_device *ndev, void *address)

static void axienet_set_mac_address(struct net_device *ndev,

				    const void *address)

{

	struct axienet_local *lp = netdev_priv(ndev);
@@ -1456,7 +1458,7 @@ static int axienet_probe(struct platform_device *pdev) 
	struct device_node *np;

	struct axienet_local *lp;

	struct net_device *ndev;

	u8 mac_addr[6];

	const void *mac_addr;

	struct resource *ethres, dmares;

	u32 value;
@@ -1567,13 +1569,12 @@ static int axienet_probe(struct platform_device *pdev) 
	}



	/* Retrieve the MAC address */

	ret = of_property_read_u8_array(pdev->dev.of_node,

					"local-mac-address", mac_addr, 6);

	if (ret) {

	mac_addr = of_get_mac_address(pdev->dev.of_node);

	if (!mac_addr) {

		dev_err(&pdev->dev, "could not find MAC address\n");

		goto free_netdev;

	}

	axienet_set_mac_address(ndev, (void *)mac_addr);

	axienet_set_mac_address(ndev, mac_addr);



	lp->coalesce_count_rx = XAXIDMA_DFT_RX_THRESHOLD;

	lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD;