diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2009-01-27 17:27:56 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-09 15:03:34 -0500 |
commit | e1623446bb1de1834ff1c57b3e8ed341d5d4a927 (patch) | |
tree | ece3595deda6d6bad747961be257d5f2cbb507b1 /drivers/net/wireless/iwlwifi/iwl-eeprom.c | |
parent | 450154e4f471248e188d18e45c2409b37a133765 (diff) |
iwlwifi: don't use implicit priv in IWL_DEBUG
Call IWL_DEBUG macro with explicit priv argument.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Samuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c index eaa658f9e54c..d1d1d9bcfeae 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c | |||
@@ -173,7 +173,7 @@ int iwlcore_eeprom_acquire_semaphore(struct iwl_priv *priv) | |||
173 | CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM, | 173 | CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM, |
174 | EEPROM_SEM_TIMEOUT); | 174 | EEPROM_SEM_TIMEOUT); |
175 | if (ret >= 0) { | 175 | if (ret >= 0) { |
176 | IWL_DEBUG_IO("Acquired semaphore after %d tries.\n", | 176 | IWL_DEBUG_IO(priv, "Acquired semaphore after %d tries.\n", |
177 | count+1); | 177 | count+1); |
178 | return ret; | 178 | return ret; |
179 | } | 179 | } |
@@ -390,7 +390,7 @@ static int iwl_set_fat_chan_info(struct iwl_priv *priv, | |||
390 | if (!is_channel_valid(ch_info)) | 390 | if (!is_channel_valid(ch_info)) |
391 | return -1; | 391 | return -1; |
392 | 392 | ||
393 | IWL_DEBUG_INFO("FAT Ch. %d [%sGHz] %s%s%s%s%s(0x%02x %ddBm):" | 393 | IWL_DEBUG_INFO(priv, "FAT Ch. %d [%sGHz] %s%s%s%s%s(0x%02x %ddBm):" |
394 | " Ad-Hoc %ssupported\n", | 394 | " Ad-Hoc %ssupported\n", |
395 | ch_info->channel, | 395 | ch_info->channel, |
396 | is_channel_a_band(ch_info) ? | 396 | is_channel_a_band(ch_info) ? |
@@ -432,11 +432,11 @@ int iwl_init_channel_map(struct iwl_priv *priv) | |||
432 | struct iwl_channel_info *ch_info; | 432 | struct iwl_channel_info *ch_info; |
433 | 433 | ||
434 | if (priv->channel_count) { | 434 | if (priv->channel_count) { |
435 | IWL_DEBUG_INFO("Channel map already initialized.\n"); | 435 | IWL_DEBUG_INFO(priv, "Channel map already initialized.\n"); |
436 | return 0; | 436 | return 0; |
437 | } | 437 | } |
438 | 438 | ||
439 | IWL_DEBUG_INFO("Initializing regulatory info from EEPROM\n"); | 439 | IWL_DEBUG_INFO(priv, "Initializing regulatory info from EEPROM\n"); |
440 | 440 | ||
441 | priv->channel_count = | 441 | priv->channel_count = |
442 | ARRAY_SIZE(iwl_eeprom_band_1) + | 442 | ARRAY_SIZE(iwl_eeprom_band_1) + |
@@ -445,7 +445,7 @@ int iwl_init_channel_map(struct iwl_priv *priv) | |||
445 | ARRAY_SIZE(iwl_eeprom_band_4) + | 445 | ARRAY_SIZE(iwl_eeprom_band_4) + |
446 | ARRAY_SIZE(iwl_eeprom_band_5); | 446 | ARRAY_SIZE(iwl_eeprom_band_5); |
447 | 447 | ||
448 | IWL_DEBUG_INFO("Parsing data for %d channels.\n", priv->channel_count); | 448 | IWL_DEBUG_INFO(priv, "Parsing data for %d channels.\n", priv->channel_count); |
449 | 449 | ||
450 | priv->channel_info = kzalloc(sizeof(struct iwl_channel_info) * | 450 | priv->channel_info = kzalloc(sizeof(struct iwl_channel_info) * |
451 | priv->channel_count, GFP_KERNEL); | 451 | priv->channel_count, GFP_KERNEL); |
@@ -485,7 +485,7 @@ int iwl_init_channel_map(struct iwl_priv *priv) | |||
485 | IEEE80211_CHAN_NO_FAT_BELOW); | 485 | IEEE80211_CHAN_NO_FAT_BELOW); |
486 | 486 | ||
487 | if (!(is_channel_valid(ch_info))) { | 487 | if (!(is_channel_valid(ch_info))) { |
488 | IWL_DEBUG_INFO("Ch. %d Flags %x [%sGHz] - " | 488 | IWL_DEBUG_INFO(priv, "Ch. %d Flags %x [%sGHz] - " |
489 | "No traffic\n", | 489 | "No traffic\n", |
490 | ch_info->channel, | 490 | ch_info->channel, |
491 | ch_info->flags, | 491 | ch_info->flags, |
@@ -501,7 +501,7 @@ int iwl_init_channel_map(struct iwl_priv *priv) | |||
501 | ch_info->scan_power = eeprom_ch_info[ch].max_power_avg; | 501 | ch_info->scan_power = eeprom_ch_info[ch].max_power_avg; |
502 | ch_info->min_power = 0; | 502 | ch_info->min_power = 0; |
503 | 503 | ||
504 | IWL_DEBUG_INFO("Ch. %d [%sGHz] %s%s%s%s%s%s(0x%02x %ddBm):" | 504 | IWL_DEBUG_INFO(priv, "Ch. %d [%sGHz] %s%s%s%s%s%s(0x%02x %ddBm):" |
505 | " Ad-Hoc %ssupported\n", | 505 | " Ad-Hoc %ssupported\n", |
506 | ch_info->channel, | 506 | ch_info->channel, |
507 | is_channel_a_band(ch_info) ? | 507 | is_channel_a_band(ch_info) ? |