iwlwifi: suppress unused variable warning when compiling w/o IWLWIFI_DEBUG

This patch adds __maybe_unused attribute to priv variables used in
functions that used it solely for debug printouts

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Cc: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index b93f5ba..45ce3ff 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -183,7 +183,7 @@ static int iwl3945_rate_scale_flush_windows(struct iwl3945_rs_sta *rs_sta)
        int unflushed = 0;
        int i;
        unsigned long flags;
-       struct iwl_priv *priv = rs_sta->priv;
+       struct iwl_priv *priv __maybe_unused = rs_sta->priv;
 
        /*
         * For each rate, if we have collected data on that rate
@@ -216,7 +216,7 @@ static int iwl3945_rate_scale_flush_windows(struct iwl3945_rs_sta *rs_sta)
 static void iwl3945_bg_rate_scale_flush(unsigned long data)
 {
        struct iwl3945_rs_sta *rs_sta = (void *)data;
-       struct iwl_priv *priv = rs_sta->priv;
+       struct iwl_priv *priv __maybe_unused = rs_sta->priv;
        int unflushed = 0;
        unsigned long flags;
        u32 packet_count, duration, pps;
@@ -290,7 +290,7 @@ static void iwl3945_collect_tx_data(struct iwl3945_rs_sta *rs_sta,
 {
        unsigned long flags;
        s32 fail_count;
-       struct iwl_priv *priv = rs_sta->priv;
+       struct iwl_priv *priv __maybe_unused = rs_sta->priv;
 
        if (!retries) {
                IWL_DEBUG_RATE("leave: retries == 0 -- should be at least 1\n");
@@ -438,7 +438,7 @@ static void rs_free_sta(void *iwl_priv, struct ieee80211_sta *sta,
 {
        struct iwl3945_sta_priv *psta = (void *) sta->drv_priv;
        struct iwl3945_rs_sta *rs_sta = priv_sta;
-       struct iwl_priv *priv = rs_sta->priv;
+       struct iwl_priv *priv __maybe_unused = rs_sta->priv;
 
        psta->rs_sta = NULL;
 
@@ -556,7 +556,7 @@ static u16 iwl3945_get_adjacent_rate(struct iwl3945_rs_sta *rs_sta,
 {
        u8 high = IWL_RATE_INVALID;
        u8 low = IWL_RATE_INVALID;
-       struct iwl_priv *priv = rs_sta->priv;
+       struct iwl_priv *priv __maybe_unused = rs_sta->priv;
 
        /* 802.11A walks to the next literal adjacent rate in
         * the rate table */

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 6a2c8a3..72ff20e 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -5270,8 +5270,8 @@ static ssize_t store_antenna(struct device *d,
                             struct device_attribute *attr,
                             const char *buf, size_t count)
 {
+       struct iwl_priv *priv __maybe_unused = dev_get_drvdata(d);
        int ant;
-       struct iwl_priv *priv = dev_get_drvdata(d);
 
        if (count == 0)
                return 0;