From: brgl@bgdev•pl (Bartosz Golaszewski)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 1/5] net: visually shrink eth_platform_get_mac_address()
Date: Wed, 18 Jul 2018 18:10:31 +0200 [thread overview]
Message-ID: <20180718161035.7005-2-brgl@bgdev.pl> (raw)
In-Reply-To: <20180718161035.7005-1-brgl@bgdev.pl>
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;
- 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
next prev parent reply other threads:[~2018-07-18 16:10 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-18 16:10 [PATCH 0/5] net: extend eth_platform_get_mac_address() Bartosz Golaszewski
2018-07-18 16:10 ` Bartosz Golaszewski [this message]
2018-07-18 16:28 ` [PATCH 1/5] net: visually shrink eth_platform_get_mac_address() Andrew Lunn
2018-07-18 16:31 ` Bartosz Golaszewski
2018-07-18 23:10 ` David Miller
2018-07-18 16:10 ` [PATCH 2/5] net: add an info message to eth_platform_get_mac_address() Bartosz Golaszewski
2018-07-18 16:31 ` Andrew Lunn
2018-07-18 16:33 ` Bartosz Golaszewski
2018-07-18 23:13 ` David Miller
2018-07-18 16:10 ` [PATCH 3/5] net: fortify eth_platform_get_mac_address() Bartosz Golaszewski
2018-07-18 16:35 ` Andrew Lunn
2018-07-18 16:10 ` [PATCH 4/5] net: add support for nvmem to eth_platform_get_mac_address() Bartosz Golaszewski
2018-07-18 16:42 ` Andrew Lunn
2018-07-19 15:22 ` Andrew Lunn
2018-07-19 15:25 ` Bartosz Golaszewski
2018-07-19 17:47 ` Russell King - ARM Linux
2018-07-19 21:24 ` Bartosz Golaszewski
2018-07-19 21:48 ` Andrew Lunn
2018-07-18 16:10 ` [PATCH 5/5] net: add MTD support " Bartosz Golaszewski
2018-07-18 16:47 ` Andrew Lunn
2018-07-18 16:54 ` Bartosz Golaszewski
2018-07-18 17:03 ` Andrew Lunn
2018-07-19 8:14 ` Bartosz Golaszewski
2018-07-19 15:01 ` Andrew Lunn
2018-07-19 15:07 ` Bartosz Golaszewski
2018-07-19 15:27 ` Andrew Lunn
2018-07-19 15:35 ` Bartosz Golaszewski
2018-07-20 5:17 ` Sekhar Nori
2018-07-20 14:15 ` Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180718161035.7005-2-brgl@bgdev.pl \
--to=brgl@bgdev$(echo .)pl \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox