diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-09 14:33:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-10 22:41:05 -0400 |
| commit | 2a5cf8016c745191605f312a7cd7bd22e9be94a5 (patch) | |
| tree | 5e43280e900e0e4f6907820f29cd9af4dd241066 /include/linux/of_mdio.h | |
| parent | c468fb1375f1b4de851e3e0dbe9d1293d414a160 (diff) | |
of/mdio: Staticise !CONFIG_OF stubs
The !CONFIG_OF stubs aren't static so if multiple files include the
header with this configuration then the linker will see multiple
definitions of the stubs.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/of_mdio.h')
| -rw-r--r-- | include/linux/of_mdio.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h index 6ef49b803efb..8163107b94b4 100644 --- a/include/linux/of_mdio.h +++ b/include/linux/of_mdio.h | |||
| @@ -26,32 +26,32 @@ extern struct phy_device *of_phy_connect_fixed_link(struct net_device *dev, | |||
| 26 | extern struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np); | 26 | extern struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np); |
| 27 | 27 | ||
| 28 | #else /* CONFIG_OF */ | 28 | #else /* CONFIG_OF */ |
| 29 | int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) | 29 | static inline int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) |
| 30 | { | 30 | { |
| 31 | return -ENOSYS; | 31 | return -ENOSYS; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | struct phy_device *of_phy_find_device(struct device_node *phy_np) | 34 | static inline struct phy_device *of_phy_find_device(struct device_node *phy_np) |
| 35 | { | 35 | { |
| 36 | return NULL; | 36 | return NULL; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | struct phy_device *of_phy_connect(struct net_device *dev, | 39 | static inline struct phy_device *of_phy_connect(struct net_device *dev, |
| 40 | struct device_node *phy_np, | 40 | struct device_node *phy_np, |
| 41 | void (*hndlr)(struct net_device *), | 41 | void (*hndlr)(struct net_device *), |
| 42 | u32 flags, phy_interface_t iface) | 42 | u32 flags, phy_interface_t iface) |
| 43 | { | 43 | { |
| 44 | return NULL; | 44 | return NULL; |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | struct phy_device *of_phy_connect_fixed_link(struct net_device *dev, | 47 | static inline struct phy_device *of_phy_connect_fixed_link(struct net_device *dev, |
| 48 | void (*hndlr)(struct net_device *), | 48 | void (*hndlr)(struct net_device *), |
| 49 | phy_interface_t iface) | 49 | phy_interface_t iface) |
| 50 | { | 50 | { |
| 51 | return NULL; | 51 | return NULL; |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np) | 54 | static inline struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np) |
| 55 | { | 55 | { |
| 56 | return NULL; | 56 | return NULL; |
| 57 | } | 57 | } |