* [PATCH] of_net: fix of_get_mac_address retval if compiled without CONFIG_OF
@ 2019-05-19 12:18 Petr Štetiar
2019-05-19 14:02 ` Andrew Lunn
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Petr Štetiar @ 2019-05-19 12:18 UTC (permalink / raw)
To: Rob Herring, Frank Rowand, Andrew Lunn, Florian Fainelli,
Heiner Kallweit
Cc: Petr Štetiar, Mirko Lindner, Stephen Hemminger, netdev,
devicetree, linux-kernel
of_get_mac_address prior to commit d01f449c008a ("of_net: add NVMEM
support to of_get_mac_address") could return only valid pointer or NULL,
after this change it could return only valid pointer or ERR_PTR encoded
error value, but I've forget to change the return value of
of_get_mac_address in case where the kernel is compiled without
CONFIG_OF, so I'm doing so now.
Cc: Mirko Lindner <mlindner@marvell.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Fixes: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
Reported-by: Octavio Alvarez <octallk1@alvarezp.org>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---
include/linux/of_net.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/of_net.h b/include/linux/of_net.h
index 9cd72aab76fe..0f0346e6829c 100644
--- a/include/linux/of_net.h
+++ b/include/linux/of_net.h
@@ -22,7 +22,7 @@ static inline int of_get_phy_mode(struct device_node *np)
static inline const void *of_get_mac_address(struct device_node *np)
{
- return NULL;
+ return ERR_PTR(-ENODEV);
}
static inline struct net_device *of_find_net_device_by_node(struct device_node *np)
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] of_net: fix of_get_mac_address retval if compiled without CONFIG_OF
2019-05-19 12:18 [PATCH] of_net: fix of_get_mac_address retval if compiled without CONFIG_OF Petr Štetiar
@ 2019-05-19 14:02 ` Andrew Lunn
2019-05-19 17:35 ` David Miller
2019-05-20 9:36 ` Sergei Shtylyov
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Lunn @ 2019-05-19 14:02 UTC (permalink / raw)
To: Petr Štetiar
Cc: Rob Herring, Frank Rowand, Florian Fainelli, Heiner Kallweit,
Mirko Lindner, Stephen Hemminger, netdev, devicetree,
linux-kernel
On Sun, May 19, 2019 at 02:18:44PM +0200, Petr Štetiar wrote:
> of_get_mac_address prior to commit d01f449c008a ("of_net: add NVMEM
> support to of_get_mac_address") could return only valid pointer or NULL,
> after this change it could return only valid pointer or ERR_PTR encoded
> error value, but I've forget to change the return value of
> of_get_mac_address in case where the kernel is compiled without
> CONFIG_OF, so I'm doing so now.
>
> Cc: Mirko Lindner <mlindner@marvell.com>
> Cc: Stephen Hemminger <stephen@networkplumber.org>
> Fixes: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
> Reported-by: Octavio Alvarez <octallk1@alvarezp.org>
> Signed-off-by: Petr Štetiar <ynezz@true.cz>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] of_net: fix of_get_mac_address retval if compiled without CONFIG_OF
2019-05-19 12:18 [PATCH] of_net: fix of_get_mac_address retval if compiled without CONFIG_OF Petr Štetiar
2019-05-19 14:02 ` Andrew Lunn
@ 2019-05-19 17:35 ` David Miller
2019-05-20 9:36 ` Sergei Shtylyov
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2019-05-19 17:35 UTC (permalink / raw)
To: ynezz
Cc: robh+dt, frowand.list, andrew, f.fainelli, hkallweit1, mlindner,
stephen, netdev, devicetree, linux-kernel
From: Petr Štetiar <ynezz@true.cz>
Date: Sun, 19 May 2019 14:18:44 +0200
> of_get_mac_address prior to commit d01f449c008a ("of_net: add NVMEM
> support to of_get_mac_address") could return only valid pointer or NULL,
> after this change it could return only valid pointer or ERR_PTR encoded
> error value, but I've forget to change the return value of
> of_get_mac_address in case where the kernel is compiled without
> CONFIG_OF, so I'm doing so now.
>
> Cc: Mirko Lindner <mlindner@marvell.com>
> Cc: Stephen Hemminger <stephen@networkplumber.org>
> Fixes: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
> Reported-by: Octavio Alvarez <octallk1@alvarezp.org>
> Signed-off-by: Petr Štetiar <ynezz@true.cz>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] of_net: fix of_get_mac_address retval if compiled without CONFIG_OF
2019-05-19 12:18 [PATCH] of_net: fix of_get_mac_address retval if compiled without CONFIG_OF Petr Štetiar
2019-05-19 14:02 ` Andrew Lunn
2019-05-19 17:35 ` David Miller
@ 2019-05-20 9:36 ` Sergei Shtylyov
2 siblings, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2019-05-20 9:36 UTC (permalink / raw)
To: Petr Štetiar, Rob Herring, Frank Rowand, Andrew Lunn,
Florian Fainelli, Heiner Kallweit
Cc: Mirko Lindner, Stephen Hemminger, netdev, devicetree, linux-kernel
Hello!
On 19.05.2019 15:18, Petr Štetiar wrote:
> of_get_mac_address prior to commit d01f449c008a ("of_net: add NVMEM
> support to of_get_mac_address") could return only valid pointer or NULL,
> after this change it could return only valid pointer or ERR_PTR encoded
> error value, but I've forget to change the return value of
It's either "I've forgotten" or just "I forgot".
> of_get_mac_address in case where the kernel is compiled without
> CONFIG_OF, so I'm doing so now.
Well, better late... :-)
> Cc: Mirko Lindner <mlindner@marvell.com>
> Cc: Stephen Hemminger <stephen@networkplumber.org>
> Fixes: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
> Reported-by: Octavio Alvarez <octallk1@alvarezp.org>
> Signed-off-by: Petr Štetiar <ynezz@true.cz>
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-20 9:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-19 12:18 [PATCH] of_net: fix of_get_mac_address retval if compiled without CONFIG_OF Petr Štetiar
2019-05-19 14:02 ` Andrew Lunn
2019-05-19 17:35 ` David Miller
2019-05-20 9:36 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®