2007-09-02 19:58:28

by Satyam Sharma

[permalink] [raw]
Subject: [PATCH -mm] net/wireless/sysfs.c: Shut up build warning


net/wireless/sysfs.c:108: warning: $B!F(Jwiphy_uevent$B!G(J defined but not used

when CONFIG_HOTPLUG=n is because the only usage site of this function
is #ifdef'ed as such, so let's #ifdef the definition also.

Signed-off-by: Satyam Sharma <[email protected]>

---

net/wireless/sysfs.c | 2 ++
1 file changed, 2 insertions(+)

--- linux-2.6.23-rc4-mm1/net/wireless/sysfs.c~fix 2007-09-02 20:06:11.000000000 +0530
+++ linux-2.6.23-rc4-mm1/net/wireless/sysfs.c 2007-09-02 20:07:01.000000000 +0530
@@ -104,11 +104,13 @@ static void wiphy_dev_release(struct dev
cfg80211_dev_free(rdev);
}

+#ifdef CONFIG_HOTPLUG
static int wiphy_uevent(struct device *dev, struct kobj_uevent_env *env)
{
/* TODO, we probably need stuff here */
return 0;
}
+#endif

struct class ieee80211_class = {
.name = "ieee80211",


2007-09-02 20:23:13

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH -mm] net/wireless/sysfs.c: Shut up build warning

On Mon, 2007-09-03 at 01:41 +0530, Satyam Sharma wrote:
> net/wireless/sysfs.c:108: warning: ‘wiphy_uevent’ defined but not used
>
> when CONFIG_HOTPLUG=n is because the only usage site of this function
> is #ifdef'ed as such, so let's #ifdef the definition also.
>
> Signed-off-by: Satyam Sharma <[email protected]>

Looks good to me. The new style seems to be to do
#ifdef SOMETHING
code
#else
#define wiphy_uevent NULL
#endif

and then using it unconditionally, but I'm fine with both.

Acked-by: Johannes Berg <[email protected]>

> ---
>
> net/wireless/sysfs.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> --- linux-2.6.23-rc4-mm1/net/wireless/sysfs.c‾fix 2007-09-02 20:06:11.000000000 +0530
> +++ linux-2.6.23-rc4-mm1/net/wireless/sysfs.c 2007-09-02 20:07:01.000000000 +0530
> @@ -104,11 +104,13 @@ static void wiphy_dev_release(struct dev
> cfg80211_dev_free(rdev);
> }
>
> +#ifdef CONFIG_HOTPLUG
> static int wiphy_uevent(struct device *dev, struct kobj_uevent_env *env)
> {
> /* TODO, we probably need stuff here */
> return 0;
> }
> +#endif
>
> struct class ieee80211_class = {
> .name = "ieee80211",


Attachments:
signature.asc (190.00 B)
This is a digitally signed message part