| Message ID | 20180718161035.7005-2-brgl@bgdev.pl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jul 18, 2018 at 06:10:31PM +0200, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > 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 <bgolaszewski@baylibre.com> > --- > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
2018-07-18 18:28 GMT+02:00 Andrew Lunn <andrew@lunn.ch>: > On Wed, Jul 18, 2018 at 06:10:31PM +0200, Bartosz Golaszewski wrote: >> From: Bartosz Golaszewski <bgolaszewski@baylibre.com> >> >> 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 <bgolaszewski@baylibre.com> >> --- >> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Bartosz Golaszewski <brgl@bgdev.pl> Date: Wed, 18 Jul 2018 18:10:31 +0200 > @@ -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; > - Reverse christmas tree is why the assignments are in the body of the function instead of the declaration area. Please don't do this, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)