Skip to contentSkip to conversation

net: thunderx: Use fwnode_get_mac_address()

PATCH Applied Andy Shevchenko 2 participants 2 messages Jul 23, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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().

---
 .../net/ethernet/cavium/thunder/thunder_bgx.c  | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)
drivers/net/ethernet/cavium/thunder/thunder_bgx.c +6 -12
index ad22554857bf..acb016834f04 100644
@@ -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. */
Signature · 1 line
2.20.1
maintainer Applied
#1 lore raw

From: Andy Shevchenko <[email protected]>
Date: Tue, 23 Jul 2019 23:03:43 +0300

Quoted 6 lines

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().

Applied.