Commit db4bad07 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

net: ethernet: improve eth_platform_get_mac_address

pci_device_to_OF_node(to_pci_dev(dev)) is the same as dev->of_node,
so we can simplify the code. In addition add an empty line before
the return statement.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent feb3cf2e
...@@ -549,17 +549,10 @@ unsigned char * __weak arch_get_platform_mac_address(void) ...@@ -549,17 +549,10 @@ unsigned char * __weak arch_get_platform_mac_address(void)
int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr) int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr)
{ {
const unsigned char *addr; const unsigned char *addr = NULL;
struct device_node *dp;
if (dev_is_pci(dev)) if (dev->of_node)
dp = pci_device_to_OF_node(to_pci_dev(dev)); addr = of_get_mac_address(dev->of_node);
else
dp = dev->of_node;
addr = NULL;
if (dp)
addr = of_get_mac_address(dp);
if (IS_ERR_OR_NULL(addr)) if (IS_ERR_OR_NULL(addr))
addr = arch_get_platform_mac_address(); addr = arch_get_platform_mac_address();
...@@ -567,6 +560,7 @@ int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr) ...@@ -567,6 +560,7 @@ int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr)
return -ENODEV; return -ENODEV;
ether_addr_copy(mac_addr, addr); ether_addr_copy(mac_addr, addr);
return 0; return 0;
} }
EXPORT_SYMBOL(eth_platform_get_mac_address); EXPORT_SYMBOL(eth_platform_get_mac_address);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment