From: Brian Norris <computersforpeace@gmail.com>
To: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Jonathan Corbet <corbet@lwn.net>, Sekhar Nori <nsekhar@ti.com>,
Kevin Hilman <khilman@kernel.org>,
Russell King <linux@armlinux.org.uk>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
David Woodhouse <dwmw2@infradead.org>,
Boris Brezillon <boris.brezillon@bootlin.com>,
Marek Vasut <marek.vasut@gmail.com>,
Richard Weinberger <richard@nod.at>,
Grygorii Strashko <grygorii.strashko@ti.com>,
"David S . Miller" <davem@davemloft.net>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Naren <naren.kernel@gmail.com>,
Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Lukas Wunner <lukas@wunner.de>,
Dan Carpenter <dan.carpenter@oracle.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>,
Sven Van Asbroeck <svendev@arcx.com>,
Paolo Abeni <pabeni@redhat.com>, Alban Bedel <albeu@free.fr>,
Rob Herring <robh@kernel.org>,
David Lechner <david@lechnology.com>,
Andrew Lunn <andrew@lunn.ch>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org,
linux-mtd@lists.infradead.org, linux-omap@vger.kernel.org,
netdev@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
briannorris@chromium.org
Subject: Re: [PATCH v2 15/29] net: split eth_platform_get_mac_address() into subroutines
Date: Fri, 31 Aug 2018 12:54:39 -0700 [thread overview]
Message-ID: <20180831195439.GB62862@ban.mtv.corp.google.com> (raw)
In-Reply-To: <20180810080526.27207-16-brgl@bgdev.pl>
Hi,
I responded to the cover letter, but I'll put some notes here too.
On Fri, Aug 10, 2018 at 10:05:12AM +0200, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
>
> We want do add more sources from which to read the MAC address. In
> order to avoid bloating this function too much, start by splitting it
> into subroutines, each of which takes care of reading the MAC from
> one source.
>
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> ---
> net/ethernet/eth.c | 44 ++++++++++++++++++++++++++++++++++++--------
> 1 file changed, 36 insertions(+), 8 deletions(-)
>
> diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
> index 7f08105402c8..d01dd55de037 100644
> --- a/net/ethernet/eth.c
> +++ b/net/ethernet/eth.c
> @@ -525,22 +525,50 @@ unsigned char * __weak arch_get_platform_mac_address(void)
> return NULL;
> }
>
> -int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr)
> +static int mac_address_from_of(struct device *dev, u8 *mac_addr)
> {
> const unsigned char *addr;
> - struct device_node *dp;
> + struct device_node *np;
>
> - dp = dev->of_node;
> - addr = NULL;
> - if (dp)
> - addr = of_get_mac_address(dp);
> - if (!addr)
> - addr = arch_get_platform_mac_address();
> + np = dev->of_node;
> + if (!np)
> + return -ENODEV;
>
> + addr = of_get_mac_address(np);
> if (!addr)
> return -ENODEV;
>
> + if (!addr || !is_valid_ether_addr(addr))
> + return -ENODEV;
> +
> ether_addr_copy(mac_addr, addr);
> return 0;
> }
> +
> +static int mac_address_from_arch(u8 *mac_addr)
> +{
> + const unsigned char *addr;
> +
> + addr = arch_get_platform_mac_address();
> + if (!addr || !is_valid_ether_addr(addr))
> + return -ENODEV;
> +
> + ether_addr_copy(mac_addr, addr);
> + return 0;
> +}
> +
> +int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr)
> +{
> + int rv;
> +
> + rv = mac_address_from_of(dev, mac_addr);
This could just be replaced with device_get_mac_address(). Then you
should be extending either fwnode_get_device_mac_address() or
device_get_mac_addres() in the next patch, not
eth_platform_get_mac_address().
Regards,
Brian
> + if (!rv)
> + return 0;
> +
> + rv = mac_address_from_arch(mac_addr);
> + if (!rv)
> + return 0;
> +
> + return -ENODEV;
> +}
> EXPORT_SYMBOL(eth_platform_get_mac_address);
> --
> 2.18.0
>
next prev parent reply other threads:[~2018-08-31 19:54 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-10 8:04 [PATCH v2 00/29] at24: remove at24_platform_data Bartosz Golaszewski
2018-08-10 8:04 ` [PATCH v2 01/29] nvmem: add support for cell lookups Bartosz Golaszewski
2018-08-24 15:08 ` Boris Brezillon
2018-08-24 15:27 ` Andrew Lunn
2018-08-25 6:27 ` Boris Brezillon
2018-08-27 8:56 ` Bartosz Golaszewski
2018-08-27 9:00 ` Boris Brezillon
2018-08-27 13:37 ` Bartosz Golaszewski
2018-08-27 14:01 ` Boris Brezillon
2018-08-28 10:15 ` Srinivas Kandagatla
2018-08-28 11:56 ` Bartosz Golaszewski
2018-08-28 13:45 ` Srinivas Kandagatla
2018-08-28 14:41 ` Bartosz Golaszewski
2018-08-28 14:48 ` Srinivas Kandagatla
2018-08-28 14:53 ` Boris Brezillon
2018-08-28 15:09 ` Srinivas Kandagatla
2018-08-10 8:04 ` [PATCH v2 02/29] Documentation: nvmem: document lookup entries Bartosz Golaszewski
2018-08-31 20:30 ` Brian Norris
2018-09-01 13:11 ` Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 03/29] nvmem: add a notifier chain Bartosz Golaszewski
2018-08-10 8:33 ` Srinivas Kandagatla
2018-08-10 8:05 ` [PATCH v2 04/29] nvmem: provide nvmem_dev_name() Bartosz Golaszewski
2018-08-10 8:10 ` Srinivas Kandagatla
2018-08-10 8:05 ` [PATCH v2 05/29] nvmem: remove the name field from struct nvmem_device Bartosz Golaszewski
2018-08-10 8:33 ` Srinivas Kandagatla
2018-08-10 8:05 ` [PATCH v2 06/29] mtd: Add support for reading MTD devices via the nvmem API Bartosz Golaszewski
2018-08-17 16:27 ` Boris Brezillon
2018-08-19 11:31 ` Alban
2018-08-19 16:46 ` Boris Brezillon
2018-08-20 10:43 ` Srinivas Kandagatla
2018-08-20 18:20 ` Boris Brezillon
2018-08-20 18:50 ` Bartosz Golaszewski
2018-08-20 19:06 ` Boris Brezillon
2018-08-20 21:27 ` Alban
2018-08-21 5:07 ` Boris Brezillon
2018-08-21 9:50 ` Srinivas Kandagatla
2018-08-21 9:56 ` Boris Brezillon
2018-08-21 10:11 ` Srinivas Kandagatla
2018-08-21 10:43 ` Boris Brezillon
2018-08-21 11:39 ` Alban
2018-08-21 12:00 ` Srinivas Kandagatla
2018-08-21 13:01 ` Boris Brezillon
2018-08-23 10:29 ` Alban
2018-08-24 14:39 ` Boris Brezillon
2018-08-28 10:20 ` Srinivas Kandagatla
2018-08-20 22:53 ` Alban
2018-08-21 5:44 ` Boris Brezillon
2018-08-21 9:38 ` Srinivas Kandagatla
2018-08-21 11:31 ` Boris Brezillon
2018-08-21 13:34 ` Srinivas Kandagatla
2018-08-21 13:37 ` Srinivas Kandagatla
2018-08-21 13:57 ` Boris Brezillon
2018-08-21 12:27 ` Alban
2018-08-21 12:57 ` Boris Brezillon
2018-08-21 13:57 ` Alban
2018-08-21 14:26 ` Boris Brezillon
2018-08-21 14:33 ` Srinivas Kandagatla
2018-08-10 8:05 ` [PATCH v2 07/29] ARM: davinci: dm365-evm: use nvmem lookup for mac address Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 08/29] ARM: davinci: dm644-evm: " Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 09/29] ARM: davinci: dm646x-evm: " Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 10/29] ARM: davinci: da830-evm: " Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 11/29] ARM: davinci: mityomapl138: add nvmem cells lookup entries Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 12/29] ARM: davinci: da850-evm: use nvmem lookup for mac address Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 13/29] ARM: davinci: da850-evm: remove unnecessary include Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 14/29] net: simplify eth_platform_get_mac_address() Bartosz Golaszewski
2018-08-10 14:39 ` Andy Shevchenko
2018-08-10 16:17 ` Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 15/29] net: split eth_platform_get_mac_address() into subroutines Bartosz Golaszewski
2018-08-31 19:54 ` Brian Norris [this message]
2018-08-10 8:05 ` [PATCH v2 16/29] net: add support for nvmem to eth_platform_get_mac_address() Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 17/29] net: davinci_emac: use eth_platform_get_mac_address() Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 18/29] ARM: davinci: da850-evm: remove dead MTD code Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 19/29] ARM: davinci: mityomapl138: don't read the MAC address from machine code Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 20/29] ARM: davinci: dm365-evm: use device properties for at24 eeprom Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 21/29] ARM: davinci: da830-evm: " Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 22/29] ARM: davinci: dm644x-evm: " Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 23/29] ARM: davinci: dm646x-evm: " Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 24/29] ARM: davinci: sffsdr: fix the at24 eeprom device name Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 25/29] ARM: davinci: sffsdr: use device properties for at24 eeprom Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 26/29] ARM: davinci: remove dead code related to MAC address reading Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 27/29] ARM: davinci: mityomapl138: use nvmem notifiers Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 28/29] ARM: davinci: mityomapl138: use device properties for at24 eeprom Bartosz Golaszewski
2018-08-10 8:05 ` [PATCH v2 29/29] eeprom: at24: kill at24_platform_data Bartosz Golaszewski
2018-08-10 8:41 ` [PATCH v2 00/29] at24: remove at24_platform_data Srinivas Kandagatla
2018-08-31 19:46 ` Brian Norris
2018-10-03 20:15 ` Bartosz Golaszewski
2018-10-03 20:30 ` Lukas Wunner
2018-10-03 21:04 ` Florian Fainelli
2018-10-04 11:06 ` Bartosz Golaszewski
2018-10-04 13:58 ` Arnd Bergmann
2018-10-04 14:35 ` Sowmini Varadhan
2018-10-04 14:38 ` Arnd Bergmann
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=20180831195439.GB62862@ban.mtv.corp.google.com \
--to=computersforpeace@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=albeu@free.fr \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=bgolaszewski@baylibre.com \
--cc=boris.brezillon@bootlin.com \
--cc=brgl@bgdev.pl \
--cc=briannorris@chromium.org \
--cc=corbet@lwn.net \
--cc=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=david@lechnology.com \
--cc=dwmw2@infradead.org \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=grygorii.strashko@ti.com \
--cc=ivan.khoronzhuk@linaro.org \
--cc=khilman@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=lukas@wunner.de \
--cc=marek.vasut@gmail.com \
--cc=mchehab+samsung@kernel.org \
--cc=naren.kernel@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=pabeni@redhat.com \
--cc=richard@nod.at \
--cc=robh@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
--cc=svendev@arcx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).