[PATCH net-next 2/2] ethernet: remove nvmem_get_mac_address()
From: Yajun Deng <hidden>
Date: 2021-10-13 08:27:01
Also in:
lkml
Subsystem:
networking drivers, networking [general], the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
nvmem_get_mac_address() is no longer used, remove it. Signed-off-by: Yajun Deng <redacted> --- include/linux/etherdevice.h | 1 - net/ethernet/eth.c | 36 ------------------------------------ 2 files changed, 37 deletions(-)
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 3cf546d2ffd1..9a8f46afe114 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h@@ -31,7 +31,6 @@ struct fwnode_handle; int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr); int platform_get_ethdev_address(struct device *dev, struct net_device *netdev); unsigned char *arch_get_platform_mac_address(void); -int nvmem_get_mac_address(struct device *dev, void *addrbuf); int device_get_mac_address(struct device *dev, char *addr); int device_get_ethdev_address(struct device *dev, struct net_device *netdev); int fwnode_get_mac_address(struct fwnode_handle *fwnode, char *addr);
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index c7d9e08107cb..210ff7235e5f 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c@@ -543,42 +543,6 @@ int platform_get_ethdev_address(struct device *dev, struct net_device *netdev) } EXPORT_SYMBOL(platform_get_ethdev_address); -/** - * nvmem_get_mac_address - Obtain the MAC address from an nvmem cell named - * 'mac-address' associated with given device. - * - * @dev: Device with which the mac-address cell is associated. - * @addrbuf: Buffer to which the MAC address will be copied on success. - * - * Returns 0 on success or a negative error number on failure. - */ -int nvmem_get_mac_address(struct device *dev, void *addrbuf) -{ - struct nvmem_cell *cell; - const void *mac; - size_t len; - - cell = nvmem_cell_get(dev, "mac-address"); - if (IS_ERR(cell)) - return PTR_ERR(cell); - - mac = nvmem_cell_read(cell, &len); - nvmem_cell_put(cell); - - if (IS_ERR(mac)) - return PTR_ERR(mac); - - if (len != ETH_ALEN || !is_valid_ether_addr(mac)) { - kfree(mac); - return -EINVAL; - } - - ether_addr_copy(addrbuf, mac); - kfree(mac); - - return 0; -} - static int fwnode_get_mac_addr(struct fwnode_handle *fwnode, const char *name, char *addr) {
--
2.32.0