aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-4965.c
diff options
context:
space:
mode:
authorWinkler, Tomas <tomas.winkler@intel.com>2008-12-18 21:37:32 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:59:16 -0500
commit39aadf8c29ad959e823efca15381bea9d0770b1e (patch)
tree302344b24ccacf38a4af759ec9c809d3b83110a0 /drivers/net/wireless/iwlwifi/iwl-4965.c
parent978785a3892b34448446e8c8a17f48454f1bdd6a (diff)
iwlwifi: replace IWL_WARNING with IWL_WARN
IWL_WARN doesn't use hidden priv pointer. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 48223627dd2..3de8d641399 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -1485,12 +1485,12 @@ static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel,
1485 1485
1486 /* stay within the table! */ 1486 /* stay within the table! */
1487 if (power_index > 107) { 1487 if (power_index > 107) {
1488 IWL_WARNING("txpower index %d > 107\n", 1488 IWL_WARN(priv, "txpower index %d > 107\n",
1489 power_index); 1489 power_index);
1490 power_index = 107; 1490 power_index = 107;
1491 } 1491 }
1492 if (power_index < 0) { 1492 if (power_index < 0) {
1493 IWL_WARNING("txpower index %d < 0\n", 1493 IWL_WARN(priv, "txpower index %d < 0\n",
1494 power_index); 1494 power_index);
1495 power_index = 0; 1495 power_index = 0;
1496 } 1496 }
@@ -1533,7 +1533,7 @@ static int iwl4965_send_tx_power(struct iwl_priv *priv)
1533 /* If this gets hit a lot, switch it to a BUG() and catch 1533 /* If this gets hit a lot, switch it to a BUG() and catch
1534 * the stack trace to find out who is calling this during 1534 * the stack trace to find out who is calling this during
1535 * a scan. */ 1535 * a scan. */
1536 IWL_WARNING("TX Power requested while scanning!\n"); 1536 IWL_WARN(priv, "TX Power requested while scanning!\n");
1537 return -EAGAIN; 1537 return -EAGAIN;
1538 } 1538 }
1539 1539
@@ -1839,7 +1839,8 @@ static int iwl4965_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,
1839 1839
1840 if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) || 1840 if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||
1841 (IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES <= txq_id)) { 1841 (IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES <= txq_id)) {
1842 IWL_WARNING("queue number out of range: %d, must be %d to %d\n", 1842 IWL_WARN(priv,
1843 "queue number out of range: %d, must be %d to %d\n",
1843 txq_id, IWL49_FIRST_AMPDU_QUEUE, 1844 txq_id, IWL49_FIRST_AMPDU_QUEUE,
1844 IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES - 1); 1845 IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES - 1);
1845 return -EINVAL; 1846 return -EINVAL;
@@ -1910,7 +1911,8 @@ static int iwl4965_txq_agg_enable(struct iwl_priv *priv, int txq_id,
1910 1911
1911 if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) || 1912 if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||
1912 (IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES <= txq_id)) { 1913 (IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES <= txq_id)) {
1913 IWL_WARNING("queue number out of range: %d, must be %d to %d\n", 1914 IWL_WARN(priv,
1915 "queue number out of range: %d, must be %d to %d\n",
1914 txq_id, IWL49_FIRST_AMPDU_QUEUE, 1916 txq_id, IWL49_FIRST_AMPDU_QUEUE,
1915 IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES - 1); 1917 IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES - 1);
1916 return -EINVAL; 1918 return -EINVAL;