diff options
| author | David S. Miller <davem@davemloft.net> | 2018-12-03 15:40:30 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-03 15:40:30 -0800 |
| commit | 37a0bc39d726a15073cca64887f01e3a12b24a18 (patch) | |
| tree | 83b758a883bbc0a8866e1647c7a27c676c54d64a /include/linux/of_net.h | |
| parent | 82208d0d54ab85d8fedbb1c9a1960bd401a4ca1a (diff) | |
| parent | 18dbfc81de708409ed82e95b418ef7092e91c2fb (diff) | |
Merge branch 'davinci_emac-read-the-MAC-address-from-nvmem'
Bartosz Golaszewski says:
====================
davinci_emac: read the MAC address from nvmem
This series is part of a bigger series that aims at removing the platform
data structure from the at24 EEPROM driver[1].
We provide a generalized version of of_get_nvmem_mac_address(), switch the
only user of the of_ variant to using it, remove the previous
implementation and use the new routine in the davinci_emac driver.
[1] https://lkml.org/lkml/2018/11/13/884
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/of_net.h')
| -rw-r--r-- | include/linux/of_net.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/of_net.h b/include/linux/of_net.h index 90d81ee9e6a0..9cd72aab76fe 100644 --- a/include/linux/of_net.h +++ b/include/linux/of_net.h @@ -13,7 +13,6 @@ struct net_device; extern int of_get_phy_mode(struct device_node *np); extern const void *of_get_mac_address(struct device_node *np); -extern int of_get_nvmem_mac_address(struct device_node *np, void *addr); extern struct net_device *of_find_net_device_by_node(struct device_node *np); #else static inline int of_get_phy_mode(struct device_node *np) @@ -26,11 +25,6 @@ static inline const void *of_get_mac_address(struct device_node *np) return NULL; } -static inline int of_get_nvmem_mac_address(struct device_node *np, void *addr) -{ - return -ENODEV; -} - static inline struct net_device *of_find_net_device_by_node(struct device_node *np) { return NULL; |