* [PATCH] of/mdio: Staticise !CONFIG_OF stubs
@ 2012-10-10 4:33 Mark Brown
2012-10-10 8:02 ` Thomas Petazzoni
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Mark Brown @ 2012-10-10 4:33 UTC (permalink / raw)
To: Srinivas Kandagatla, David S. Miller; +Cc: Fengguang Wu, netdev, Mark Brown
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>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] of/mdio: Staticise !CONFIG_OF stubs
2012-10-10 4:33 [PATCH] of/mdio: Staticise !CONFIG_OF stubs Mark Brown
@ 2012-10-10 8:02 ` Thomas Petazzoni
2012-10-10 9:56 ` Srinivas KANDAGATLA
2012-10-11 2:34 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2012-10-10 8:02 UTC (permalink / raw)
To: Mark Brown; +Cc: Srinivas Kandagatla, David S. Miller, Fengguang Wu, netdev
On Wed, 10 Oct 2012 13:33:38 +0900, Mark Brown wrote:
> 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>
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] of/mdio: Staticise !CONFIG_OF stubs
2012-10-10 4:33 [PATCH] of/mdio: Staticise !CONFIG_OF stubs Mark Brown
2012-10-10 8:02 ` Thomas Petazzoni
@ 2012-10-10 9:56 ` Srinivas KANDAGATLA
2012-10-11 2:34 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: Srinivas KANDAGATLA @ 2012-10-10 9:56 UTC (permalink / raw)
To: Mark Brown; +Cc: David S. Miller, Fengguang Wu, netdev
On 10/10/12 05:33, Mark Brown wrote:
> 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>
> ---
> include/linux/of_mdio.h | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] of/mdio: Staticise !CONFIG_OF stubs
2012-10-10 4:33 [PATCH] of/mdio: Staticise !CONFIG_OF stubs Mark Brown
2012-10-10 8:02 ` Thomas Petazzoni
2012-10-10 9:56 ` Srinivas KANDAGATLA
@ 2012-10-11 2:34 ` David Miller
2012-10-11 2:38 ` David Miller
2 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2012-10-11 2:34 UTC (permalink / raw)
To: broonie; +Cc: srinivas.kandagatla, fengguang.wu, netdev
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 10 Oct 2012 13:33:38 +0900
> 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>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] of/mdio: Staticise !CONFIG_OF stubs
2012-10-11 2:34 ` David Miller
@ 2012-10-11 2:38 ` David Miller
2012-10-11 7:16 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2012-10-11 2:38 UTC (permalink / raw)
To: broonie; +Cc: srinivas.kandagatla, fengguang.wu, netdev
From: David Miller <davem@davemloft.net>
Date: Wed, 10 Oct 2012 22:34:27 -0400 (EDT)
> From: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Date: Wed, 10 Oct 2012 13:33:38 +0900
>
>> 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>
>
> Applied.
Did you actually try to compile this?
In file included from drivers/net/phy/mdio_bus.c:29:0:
include/linux/of_mdio.h:29:12: warning: ‘of_mdiobus_register’ defined but not used [-Wunused-function]
include/linux/of_mdio.h:34:27: warning: ‘of_phy_find_device’ defined but not used [-Wunused-function]
include/linux/of_mdio.h:39:27: warning: ‘of_phy_connect’ defined but not used [-Wunused-function]
include/linux/of_mdio.h:47:27: warning: ‘of_phy_connect_fixed_link’ defined but not used [-Wunused-function]
include/linux/of_mdio.h:54:24: warning: ‘of_mdio_find_bus’ defined but not used [-Wunused-function]
In file included from drivers/net/phy/mdio-gpio.c:32:0:
include/linux/of_mdio.h:34:27: warning: ‘of_phy_find_device’ defined but not used [-Wunused-function]
include/linux/of_mdio.h:39:27: warning: ‘of_phy_connect’ defined but not used [-Wunused-function]
include/linux/of_mdio.h:47:27: warning: ‘of_phy_connect_fixed_link’ defined but not used [-Wunused-function]
include/linux/of_mdio.h:54:24: warning: ‘of_mdio_find_bus’ defined but not used [-Wunused-function]
If you're going to mark this stuff static, you gotta mark that
shit inline too.
I'll fix this up, but test your changes please.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] of/mdio: Staticise !CONFIG_OF stubs
2012-10-11 2:38 ` David Miller
@ 2012-10-11 7:16 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2012-10-11 7:16 UTC (permalink / raw)
To: David Miller; +Cc: srinivas.kandagatla, fengguang.wu, netdev
On Wed, Oct 10, 2012 at 10:38:50PM -0400, David Miller wrote:
> Did you actually try to compile this?
Yup, and the kernel did actually build.
> In file included from drivers/net/phy/mdio_bus.c:29:0:
> include/linux/of_mdio.h:29:12: warning: ‘of_mdiobus_register’ defined but not used [-Wunused-function]
> I'll fix this up, but test your changes please.
I'm afraid I missed all those in among the other warnings in net/, sorry
(I needed to do a full rebuild as it was a config change to fix up the
underlying error and I always build with sparse enabled which generates
a bunch of warnings in net/).
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-10-11 7:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-10 4:33 [PATCH] of/mdio: Staticise !CONFIG_OF stubs Mark Brown
2012-10-10 8:02 ` Thomas Petazzoni
2012-10-10 9:56 ` Srinivas KANDAGATLA
2012-10-11 2:34 ` David Miller
2012-10-11 2:38 ` David Miller
2012-10-11 7:16 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).