From: Oliver Hartkopp <socketcan@hartkopp.net>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org,
Wey-Yi Guy <wey-yi.w.guy@intel.com>,
Intel Linux Wireless <ilw@linux.intel.com>
Subject: [PATCH] iwlwifi: fix unused variable warning
Date: Sun, 25 Mar 2012 08:43:24 +0200 [thread overview]
Message-ID: <4F6EBE8C.6000302@hartkopp.net> (raw)
In-Reply-To: <1318506157-10329-1-git-send-email-mkl@pengutronix.de>
In the case of disabled CONFIG_IWLWIFI_DEBUGFS option the compiler complains
about the unused variable 'img'. Fix this by moving the 'img' definition.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
---
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index b6805f8..0f5db8b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -437,7 +437,6 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
unsigned long flags;
u32 base, status = 0xffffffff;
int ret = -EIO;
- const struct fw_img *img;
IWL_DEBUG_MAC80211(priv, "enter\n");
mutex_lock(&priv->mutex);
@@ -458,6 +457,8 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
#ifdef CONFIG_IWLWIFI_DEBUGFS
if (ret == 0) {
+ const struct fw_img *img;
+
img = &(priv->fw->img[IWL_UCODE_WOWLAN]);
if (!priv->wowlan_sram) {
priv->wowlan_sram =
next prev parent reply other threads:[~2012-03-25 7:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-13 11:42 [PATCH] MAINTAINERS: can: the mailinglist moved to vger.kernel.org Marc Kleine-Budde
2011-10-13 20:17 ` Oliver Hartkopp
2011-11-02 20:55 ` [PATCH] MAINTAINERS: Add can-gw include to maintained files Oliver Hartkopp
2011-11-03 22:12 ` David Miller
2012-02-14 19:27 ` [PATCH] can: sja1000 fix isr hang when hw is unplugged under load Oliver Hartkopp
2012-02-15 16:51 ` [PATCH v2] " Oliver Hartkopp
2012-02-17 20:27 ` Marc Kleine-Budde
2012-02-18 14:19 ` Oliver Hartkopp
2012-02-18 17:00 ` Marc Kleine-Budde
2012-02-20 11:02 ` Marc Kleine-Budde
2012-02-21 8:07 ` Oliver Hartkopp
2012-02-21 9:03 ` Marc Kleine-Budde
2012-02-18 14:33 ` Wolfgang Grandegger
2012-02-18 15:34 ` Oliver Hartkopp
2012-02-18 16:44 ` Wolfgang Grandegger
2012-02-18 17:00 ` Marc Kleine-Budde
2012-02-18 17:13 ` Wolfgang Grandegger
2012-03-25 6:43 ` Oliver Hartkopp [this message]
2012-03-26 1:49 ` [PATCH] iwlwifi: fix unused variable warning Guy, Wey-Yi
2012-04-03 19:56 ` [PATCH RFC] can: add hash table for single EFF id filter list Oliver Hartkopp
2012-05-08 20:20 ` [PATCH] can: update documentation wording error frames -> error messages Oliver Hartkopp
2012-05-08 20:38 ` Marc Kleine-Budde
2012-05-09 17:09 ` Heinz-Jürgen Oertel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F6EBE8C.6000302@hartkopp.net \
--to=socketcan@hartkopp.net \
--cc=ilw@linux.intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=wey-yi.w.guy@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.