[PATCH 1/5] net: visually shrink eth_platform_get_mac_address()
From: Bartosz Golaszewski <hidden>
Date: 2018-07-18 16:12:32
Also in:
linux-omap, lkml, netdev
Subsystem:
networking [general], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Bartosz Golaszewski <redacted> Initialize the variables with proper values so that we save a few lines of code before we extend this function in the follow-up patches. Signed-off-by: Bartosz Golaszewski <redacted> --- net/ethernet/eth.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index ee28440f57c5..da8530879e1e 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c@@ -527,15 +527,10 @@ unsigned char * __weak arch_get_platform_mac_address(void) int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr) { - const unsigned char *addr; - struct device_node *dp; + struct device_node *dp = dev_is_pci(dev) ? + pci_device_to_OF_node(to_pci_dev(dev)) : dev->of_node; + const unsigned char *addr = NULL; - if (dev_is_pci(dev)) - dp = pci_device_to_OF_node(to_pci_dev(dev)); - else - dp = dev->of_node; - - addr = NULL; if (dp) addr = of_get_mac_address(dp); if (!addr)
--
2.17.1