LinuxLists.cc - [PATCH] p54: fix compiler-warning when no P54

2010-12-29 15:20:56

Subject: [PATCH] p54: fix compiler-warning when no P54_LEDS are configured

The priv-variable is unused when compiling without CONFIG_P54_LEDS.

Signed-off-by: Christoph Paasch <[email protected]>
---
drivers/net/wireless/p54/main.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index 622d27b..a6802f5 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -611,7 +611,9 @@ EXPORT_SYMBOL_GPL(p54_init_common);

int p54_register_common(struct ieee80211_hw *dev, struct device *pdev)
{
+#ifdef CONFIG_P54_LEDS
struct p54_common *priv = dev->priv;
+#endif /* CONFIG_P54_LEDS */
int err;

err = ieee80211_register_hw(dev);
@@ -653,9 +655,9 @@ EXPORT_SYMBOL_GPL(p54_free_common);

void p54_unregister_common(struct ieee80211_hw *dev)
{
+#ifdef CONFIG_P54_LEDS
struct p54_common *priv = dev->priv;

-#ifdef CONFIG_P54_LEDS
p54_unregister_leds(priv);
#endif /* CONFIG_P54_LEDS */

--
1.7.1

2010-12-29 16:46:19

by Larry Finger

[permalink] [raw]

Subject: Re: [PATCH] p54: fix compiler-warning when no P54_LEDS are configured

On 12/29/2010 09:14 AM, Christoph Paasch wrote:
> The priv-variable is unused when compiling without CONFIG_P54_LEDS.
>
> Signed-off-by: Christoph Paasch <[email protected]>
> ---
> drivers/net/wireless/p54/main.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
> index 622d27b..a6802f5 100644
> --- a/drivers/net/wireless/p54/main.c
> +++ b/drivers/net/wireless/p54/main.c
> @@ -611,7 +611,9 @@ EXPORT_SYMBOL_GPL(p54_init_common);
>
> int p54_register_common(struct ieee80211_hw *dev, struct device *pdev)
> {
> +#ifdef CONFIG_P54_LEDS
> struct p54_common *priv = dev->priv;
> +#endif /* CONFIG_P54_LEDS */
> int err;
>
> err = ieee80211_register_hw(dev);
> @@ -653,9 +655,9 @@ EXPORT_SYMBOL_GPL(p54_free_common);
>
> void p54_unregister_common(struct ieee80211_hw *dev)
> {
> +#ifdef CONFIG_P54_LEDS
> struct p54_common *priv = dev->priv;
>
> -#ifdef CONFIG_P54_LEDS
> p54_unregister_leds(priv);
> #endif /* CONFIG_P54_LEDS */
>

I was too quick to ACK this. The second hunk causes a compiler ERROR as priv is
needed in the mutex_destroy() calls.

NACK

Larry

2010-12-29 16:19:53

by Larry Finger

[permalink] [raw]

Subject: Re: [PATCH] p54: fix compiler-warning when no P54_LEDS are configured

2010-12-29 17:16:55

by Christoph Paasch

[permalink] [raw]

Subject: Re: [PATCH] p54: fix compiler-warning when no P54_LEDS are configured

On Wednesday, December 29, 2010 wrote Larry Finger:
> I was too quick to ACK this. The second hunk causes a compiler ERROR as
> priv is needed in the mutex_destroy() calls.

Oups, sorry. I did not have CONFIG_DEBUG_MUTEXES enabled when trying it out.
Thus the compile-error did not happen.

What about the following patch?

>From 5701b5f5ffbf0927025906e968c957f3b2292ece Mon Sep 17 00:00:00 2001
From: Christoph Paasch <[email protected]>
Date: Wed, 29 Dec 2010 12:40:43 +0100
Subject: [PATCH] p54: fix compiler-warning when no P54_LEDS are configured

The priv-variable is unused when compiling without CONFIG_P54_LEDS.

Signed-off-by: Christoph Paasch <[email protected]>
---
drivers/net/wireless/p54/main.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index 622d27b..56ea1ce 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -611,7 +611,9 @@ EXPORT_SYMBOL_GPL(p54_init_common);

int p54_register_common(struct ieee80211_hw *dev, struct device *pdev)
{
+#ifdef CONFIG_P54_LEDS
struct p54_common *priv = dev->priv;
+#endif /* CONFIG_P54_LEDS */
int err;

err = ieee80211_register_hw(dev);
@@ -653,7 +655,9 @@ EXPORT_SYMBOL_GPL(p54_free_common);

void p54_unregister_common(struct ieee80211_hw *dev)
{
+#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_P54_LEDS)
struct p54_common *priv = dev->priv;
+#endif

#ifdef CONFIG_P54_LEDS
p54_unregister_leds(priv);
--
1.7.1

--
Christoph Paasch

Research Assistant
IP Networking Lab --- http://inl.info.ucl.ac.be
MultiPath TCP --- http://inl.info.ucl.ac.be/mptcp
Universit? Catholique de Louvain

http://www.rollerbulls.be
--

2010-12-29 18:13:14

by Johannes Berg

[permalink] [raw]

Subject: Re: [PATCH] p54: fix compiler-warning when no P54_LEDS are configured

On Wed, 2010-12-29 at 18:16 +0100, Christoph Paasch wrote:

> +#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_P54_LEDS)
> struct p54_common *priv = dev->priv;
> +#endif

It seems a lot simpler to just add __maybe_unused...

johannes

2010-12-29 17:32:42

by Larry Finger

[permalink] [raw]

Subject: Re: [PATCH] p54: fix compiler-warning when no P54_LEDS are configured

On 12/29/2010 11:16 AM, Christoph Paasch wrote:
> On Wednesday, December 29, 2010 wrote Larry Finger:
>> I was too quick to ACK this. The second hunk causes a compiler ERROR as
>> priv is needed in the mutex_destroy() calls.
>
> Oups, sorry. I did not have CONFIG_DEBUG_MUTEXES enabled when trying it out.
> Thus the compile-error did not happen.
>
> What about the following patch?

It seems to be what is needed if the mutex_destroy() calls are compiled away.

> From 5701b5f5ffbf0927025906e968c957f3b2292ece Mon Sep 17 00:00:00 2001
> From: Christoph Paasch <[email protected]>
> Date: Wed, 29 Dec 2010 12:40:43 +0100
> Subject: [PATCH] p54: fix compiler-warning when no P54_LEDS are configured
>
> The priv-variable is unused when compiling without CONFIG_P54_LEDS.
>
> Signed-off-by: Christoph Paasch <[email protected]>
> ---
> drivers/net/wireless/p54/main.c | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
> index 622d27b..56ea1ce 100644
> --- a/drivers/net/wireless/p54/main.c
> +++ b/drivers/net/wireless/p54/main.c
> @@ -611,7 +611,9 @@ EXPORT_SYMBOL_GPL(p54_init_common);
>
> int p54_register_common(struct ieee80211_hw *dev, struct device *pdev)
> {
> +#ifdef CONFIG_P54_LEDS
> struct p54_common *priv = dev->priv;
> +#endif /* CONFIG_P54_LEDS */
> int err;
>
> err = ieee80211_register_hw(dev);
> @@ -653,7 +655,9 @@ EXPORT_SYMBOL_GPL(p54_free_common);
>
> void p54_unregister_common(struct ieee80211_hw *dev)
> {
> +#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_P54_LEDS)
> struct p54_common *priv = dev->priv;
> +#endif
>
> #ifdef CONFIG_P54_LEDS
> p54_unregister_leds(priv);

Larry