Re: [PATCH 1/5] net: visually shrink eth_platform_get_mac_address()

2018-07-18 18:28 GMT+02:00 Andrew Lunn [off-list ref]:

On Wed, Jul 18, 2018 at 06:10:31PM +0200, Bartosz Golaszewski wrote:

quoted

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;

Hi Bartosz

You are now in the net subsystem, which has its own set of additional
coding styles. One of them is reverse Christmas tree.

You might want to read Documentation/networking/netdev-FAQ.txt.

    Andrew

Hi Andrew,

it's still reverse Christmas tree in this patch except that now we're
taking the length of the variable + initializer into account. I'm not
sure if this is the right approach though.

Bart