diff options
author | Winkler, Tomas <tomas.winkler@intel.com> | 2008-12-18 21:37:32 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 15:59:16 -0500 |
commit | 39aadf8c29ad959e823efca15381bea9d0770b1e (patch) | |
tree | 302344b24ccacf38a4af759ec9c809d3b83110a0 /drivers/net/wireless/iwlwifi/iwl-5000.c | |
parent | 978785a3892b34448446e8c8a17f48454f1bdd6a (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-5000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 338444ab003e..448bdb65bffe 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -676,7 +676,8 @@ static void iwl5000_init_alive_start(struct iwl_priv *priv) | |||
676 | iwl_clear_stations_table(priv); | 676 | iwl_clear_stations_table(priv); |
677 | ret = priv->cfg->ops->lib->alive_notify(priv); | 677 | ret = priv->cfg->ops->lib->alive_notify(priv); |
678 | if (ret) { | 678 | if (ret) { |
679 | IWL_WARNING("Could not complete ALIVE transition: %d\n", ret); | 679 | IWL_WARN(priv, |
680 | "Could not complete ALIVE transition: %d\n", ret); | ||
680 | goto restart; | 681 | goto restart; |
681 | } | 682 | } |
682 | 683 | ||
@@ -1012,7 +1013,8 @@ static int iwl5000_txq_agg_enable(struct iwl_priv *priv, int txq_id, | |||
1012 | 1013 | ||
1013 | if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) || | 1014 | if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) || |
1014 | (IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES <= txq_id)) { | 1015 | (IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES <= txq_id)) { |
1015 | IWL_WARNING("queue number out of range: %d, must be %d to %d\n", | 1016 | IWL_WARN(priv, |
1017 | "queue number out of range: %d, must be %d to %d\n", | ||
1016 | txq_id, IWL50_FIRST_AMPDU_QUEUE, | 1018 | txq_id, IWL50_FIRST_AMPDU_QUEUE, |
1017 | IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES - 1); | 1019 | IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES - 1); |
1018 | return -EINVAL; | 1020 | return -EINVAL; |
@@ -1077,7 +1079,8 @@ static int iwl5000_txq_agg_disable(struct iwl_priv *priv, u16 txq_id, | |||
1077 | 1079 | ||
1078 | if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) || | 1080 | if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) || |
1079 | (IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES <= txq_id)) { | 1081 | (IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES <= txq_id)) { |
1080 | IWL_WARNING("queue number out of range: %d, must be %d to %d\n", | 1082 | IWL_WARN(priv, |
1083 | "queue number out of range: %d, must be %d to %d\n", | ||
1081 | txq_id, IWL50_FIRST_AMPDU_QUEUE, | 1084 | txq_id, IWL50_FIRST_AMPDU_QUEUE, |
1082 | IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES - 1); | 1085 | IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES - 1); |
1083 | return -EINVAL; | 1086 | return -EINVAL; |