[PATCH] of/mdio: Staticise !CONFIG_OF stubs
flat view
STALE5126d
From: Mark Brown <hidden>
Date: 2012-10-10 04:33:53
Subsystem:
ethernet phy library, open firmware and flattened device tree, the rest · Maintainers:
Andrew Lunn, Heiner Kallweit, Rob Herring, Saravana Kannan, Linus Torvalds
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 <redacted> Signed-off-by: Mark Brown <redacted> --- include/linux/of_mdio.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h
index 6ef49b8..00f336f 100644
--- a/include/linux/of_mdio.h
+++ b/include/linux/of_mdio.h@@ -26,17 +26,17 @@ extern struct phy_device *of_phy_connect_fixed_link(struct net_device *dev, extern struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np); #else /* CONFIG_OF */ -int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) +static int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) { return -ENOSYS; } -struct phy_device *of_phy_find_device(struct device_node *phy_np) +static struct phy_device *of_phy_find_device(struct device_node *phy_np) { return NULL; } -struct phy_device *of_phy_connect(struct net_device *dev, +static struct phy_device *of_phy_connect(struct net_device *dev, struct device_node *phy_np, void (*hndlr)(struct net_device *), u32 flags, phy_interface_t iface)
@@ -44,14 +44,14 @@ struct phy_device *of_phy_connect(struct net_device *dev, return NULL; } -struct phy_device *of_phy_connect_fixed_link(struct net_device *dev, +static struct phy_device *of_phy_connect_fixed_link(struct net_device *dev, void (*hndlr)(struct net_device *), phy_interface_t iface) { return NULL; } -struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np) +static struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np) { return NULL; }
--
1.7.10.4