diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-power.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index a4634595c59f..abe0d2966a56 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c | |||
@@ -149,7 +149,7 @@ static void iwl_power_init_handle(struct iwl_priv *priv) | |||
149 | int i; | 149 | int i; |
150 | u16 pci_pm; | 150 | u16 pci_pm; |
151 | 151 | ||
152 | IWL_DEBUG_POWER("Initialize power \n"); | 152 | IWL_DEBUG_POWER(priv, "Initialize power \n"); |
153 | 153 | ||
154 | pow_data = &priv->power_data; | 154 | pow_data = &priv->power_data; |
155 | 155 | ||
@@ -161,7 +161,7 @@ static void iwl_power_init_handle(struct iwl_priv *priv) | |||
161 | 161 | ||
162 | pci_read_config_word(priv->pci_dev, PCI_CFG_LINK_CTRL, &pci_pm); | 162 | pci_read_config_word(priv->pci_dev, PCI_CFG_LINK_CTRL, &pci_pm); |
163 | 163 | ||
164 | IWL_DEBUG_POWER("adjust power command flags\n"); | 164 | IWL_DEBUG_POWER(priv, "adjust power command flags\n"); |
165 | 165 | ||
166 | for (i = 0; i < IWL_POWER_MAX; i++) { | 166 | for (i = 0; i < IWL_POWER_MAX; i++) { |
167 | cmd = &pow_data->pwr_range_0[i].cmd; | 167 | cmd = &pow_data->pwr_range_0[i].cmd; |
@@ -185,7 +185,7 @@ static int iwl_update_power_cmd(struct iwl_priv *priv, | |||
185 | bool skip; | 185 | bool skip; |
186 | 186 | ||
187 | if (mode > IWL_POWER_INDEX_5) { | 187 | if (mode > IWL_POWER_INDEX_5) { |
188 | IWL_DEBUG_POWER("Error invalid power mode \n"); | 188 | IWL_DEBUG_POWER(priv, "Error invalid power mode \n"); |
189 | return -EINVAL; | 189 | return -EINVAL; |
190 | } | 190 | } |
191 | 191 | ||
@@ -225,10 +225,10 @@ static int iwl_update_power_cmd(struct iwl_priv *priv, | |||
225 | if (le32_to_cpu(cmd->sleep_interval[i]) > max_sleep) | 225 | if (le32_to_cpu(cmd->sleep_interval[i]) > max_sleep) |
226 | cmd->sleep_interval[i] = cpu_to_le32(max_sleep); | 226 | cmd->sleep_interval[i] = cpu_to_le32(max_sleep); |
227 | 227 | ||
228 | IWL_DEBUG_POWER("Flags value = 0x%08X\n", cmd->flags); | 228 | IWL_DEBUG_POWER(priv, "Flags value = 0x%08X\n", cmd->flags); |
229 | IWL_DEBUG_POWER("Tx timeout = %u\n", le32_to_cpu(cmd->tx_data_timeout)); | 229 | IWL_DEBUG_POWER(priv, "Tx timeout = %u\n", le32_to_cpu(cmd->tx_data_timeout)); |
230 | IWL_DEBUG_POWER("Rx timeout = %u\n", le32_to_cpu(cmd->rx_data_timeout)); | 230 | IWL_DEBUG_POWER(priv, "Rx timeout = %u\n", le32_to_cpu(cmd->rx_data_timeout)); |
231 | IWL_DEBUG_POWER("Sleep interval vector = { %d , %d , %d , %d , %d }\n", | 231 | IWL_DEBUG_POWER(priv, "Sleep interval vector = { %d , %d , %d , %d , %d }\n", |
232 | le32_to_cpu(cmd->sleep_interval[0]), | 232 | le32_to_cpu(cmd->sleep_interval[0]), |
233 | le32_to_cpu(cmd->sleep_interval[1]), | 233 | le32_to_cpu(cmd->sleep_interval[1]), |
234 | le32_to_cpu(cmd->sleep_interval[2]), | 234 | le32_to_cpu(cmd->sleep_interval[2]), |
@@ -302,7 +302,7 @@ int iwl_power_update_mode(struct iwl_priv *priv, bool force) | |||
302 | if (priv->cfg->ops->lib->update_chain_flags && update_chains) | 302 | if (priv->cfg->ops->lib->update_chain_flags && update_chains) |
303 | priv->cfg->ops->lib->update_chain_flags(priv); | 303 | priv->cfg->ops->lib->update_chain_flags(priv); |
304 | else | 304 | else |
305 | IWL_DEBUG_POWER("Cannot update the power, chain noise " | 305 | IWL_DEBUG_POWER(priv, "Cannot update the power, chain noise " |
306 | "calibration running: %d\n", | 306 | "calibration running: %d\n", |
307 | priv->chain_noise_data.state); | 307 | priv->chain_noise_data.state); |
308 | if (!ret) | 308 | if (!ret) |
@@ -423,7 +423,7 @@ static void iwl_bg_set_power_save(struct work_struct *work) | |||
423 | { | 423 | { |
424 | struct iwl_priv *priv = container_of(work, | 424 | struct iwl_priv *priv = container_of(work, |
425 | struct iwl_priv, set_power_save.work); | 425 | struct iwl_priv, set_power_save.work); |
426 | IWL_DEBUG(IWL_DL_STATE, "update power\n"); | 426 | IWL_DEBUG_POWER(priv, "update power\n"); |
427 | 427 | ||
428 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) | 428 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) |
429 | return; | 429 | return; |