Return-path: Received: from mail-fx0-f46.google.com ([209.85.161.46]:47542 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753465Ab0L2Rcm (ORCPT ); Wed, 29 Dec 2010 12:32:42 -0500 Received: by fxm20 with SMTP id 20so10634232fxm.19 for ; Wed, 29 Dec 2010 09:32:40 -0800 (PST) Message-ID: <4D1B70B3.7030303@lwfinger.net> Date: Wed, 29 Dec 2010 11:32:35 -0600 From: Larry Finger MIME-Version: 1.0 To: christoph.paasch@uclouvain.be CC: linville@tuxdriver.com, linux-wireless@vger.kernel.org, chunkeey@googlemail.com Subject: Re: [PATCH] p54: fix compiler-warning when no P54_LEDS are configured References: <1293635679-9783-1-git-send-email-christoph.paasch@uclouvain.be> <4D1B65D7.8090103@lwfinger.net> <201012291816.27302.christoph.paasch@uclouvain.be> In-Reply-To: <201012291816.27302.christoph.paasch@uclouvain.be> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: 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 > 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 > --- > 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