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

Commit d86afb89 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller
Browse files

net: thunderx: Use fwnode_get_mac_address() 



Replace the custom implementation with fwnode_get_mac_address,
which works on both DT and ACPI platforms.

While here, replace memcpy() by ether_addr_copy().

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a261e379

drivers/net/ethernet/cavium/thunder/thunder_bgx.c

+6 −12
Original line number Diff line number Diff line
@@ -1381,24 +1381,18 @@ static int acpi_get_mac_address(struct device *dev, struct acpi_device *adev, 
				u8 *dst)

{

	u8 mac[ETH_ALEN];

	int ret;

	u8 *addr;



	ret = fwnode_property_read_u8_array(acpi_fwnode_handle(adev),

					    "mac-address", mac, ETH_ALEN);

	if (ret)

		goto out;



	if (!is_valid_ether_addr(mac)) {

	addr = fwnode_get_mac_address(acpi_fwnode_handle(adev), mac, ETH_ALEN);

	if (!addr) {

		dev_err(dev, "MAC address invalid: %pM\n", mac);

		ret = -EINVAL;

		goto out;

		return -EINVAL;

	}



	dev_info(dev, "MAC address set to: %pM\n", mac);



	memcpy(dst, mac, ETH_ALEN);

out:

	return ret;

	ether_addr_copy(dst, mac);

	return 0;

}



/* Currently only sets the MAC address. */