2018-02-07 19:37:49

by Mathieu Malaterre

Subject: [PATCH] net: Extra '_get' in declaration of arch_get_platform_mac_address

In commit c7f5d105495a ("net: Add eth_platform_get_mac_address() helper."),
two declarations were added:

int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr);
unsigned char *arch_get_platform_get_mac_address(void);

An extra '_get' was introduced in arch_get_platform_get_mac_address, remove
it. Fix compile warning using W=1:

CC net/ethernet/eth.o
net/ethernet/eth.c:523:24: warning: no previous prototype for ‘arch_get_platform_mac_address’ [-Wmissing-prototypes]
unsigned char * __weak arch_get_platform_mac_address(void)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
AR net/ethernet/built-in.o

Signed-off-by: Mathieu Malaterre <[email protected]>
---
include/linux/etherdevice.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 263dbcad22fc..79563840c295 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -31,7 +31,7 @@
#ifdef __KERNEL__
struct device;
int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr);
-unsigned char *arch_get_platform_get_mac_address(void);
+unsigned char *arch_get_platform_mac_address(void);
u32 eth_get_headlen(void *data, unsigned int max_len);
__be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev);
extern const struct header_ops eth_header_ops;
--
2.11.0

2018-02-08 20:15:30

by David Miller

Subject: Re: [PATCH] net: Extra '_get' in declaration of arch_get_platform_mac_address

From: Mathieu Malaterre <[email protected]>
Date: Wed, 7 Feb 2018 20:35:00 +0100

> In commit c7f5d105495a ("net: Add eth_platform_get_mac_address() helper."),
> two declarations were added:
>
> int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr);
> unsigned char *arch_get_platform_get_mac_address(void);
>
> An extra '_get' was introduced in arch_get_platform_get_mac_address, remove
> it. Fix compile warning using W=1:
>
> CC net/ethernet/eth.o
> net/ethernet/eth.c:523:24: warning: no previous prototype for ?arch_get_platform_mac_address? [-Wmissing-prototypes]
> unsigned char * __weak arch_get_platform_mac_address(void)
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> AR net/ethernet/built-in.o
>
> Signed-off-by: Mathieu Malaterre <[email protected]>

I'm very surprised this warning didn't get triggered before.

That's really weird!

Applied, thank you.