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-led.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-led.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-led.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c index 501cffeff5f2..63d669ec20c6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-led.c +++ b/drivers/net/wireless/iwlwifi/iwl-led.c | |||
@@ -123,7 +123,7 @@ static int iwl4965_led_pattern(struct iwl_priv *priv, int led_id, | |||
123 | /* Set led register off */ | 123 | /* Set led register off */ |
124 | static int iwl4965_led_on_reg(struct iwl_priv *priv, int led_id) | 124 | static int iwl4965_led_on_reg(struct iwl_priv *priv, int led_id) |
125 | { | 125 | { |
126 | IWL_DEBUG_LED("led on %d\n", led_id); | 126 | IWL_DEBUG_LED(priv, "led on %d\n", led_id); |
127 | iwl_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_ON); | 127 | iwl_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_ON); |
128 | return 0; | 128 | return 0; |
129 | } | 129 | } |
@@ -150,7 +150,7 @@ int iwl4965_led_off(struct iwl_priv *priv, int led_id) | |||
150 | .off = 0, | 150 | .off = 0, |
151 | .interval = IWL_DEF_LED_INTRVL | 151 | .interval = IWL_DEF_LED_INTRVL |
152 | }; | 152 | }; |
153 | IWL_DEBUG_LED("led off %d\n", led_id); | 153 | IWL_DEBUG_LED(priv, "led off %d\n", led_id); |
154 | return iwl_send_led_cmd(priv, &led_cmd); | 154 | return iwl_send_led_cmd(priv, &led_cmd); |
155 | } | 155 | } |
156 | #endif | 156 | #endif |
@@ -159,7 +159,7 @@ int iwl4965_led_off(struct iwl_priv *priv, int led_id) | |||
159 | /* Set led register off */ | 159 | /* Set led register off */ |
160 | static int iwl4965_led_off_reg(struct iwl_priv *priv, int led_id) | 160 | static int iwl4965_led_off_reg(struct iwl_priv *priv, int led_id) |
161 | { | 161 | { |
162 | IWL_DEBUG_LED("LED Reg off\n"); | 162 | IWL_DEBUG_LED(priv, "LED Reg off\n"); |
163 | iwl_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_OFF); | 163 | iwl_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_OFF); |
164 | return 0; | 164 | return 0; |
165 | } | 165 | } |
@@ -169,7 +169,7 @@ static int iwl4965_led_off_reg(struct iwl_priv *priv, int led_id) | |||
169 | */ | 169 | */ |
170 | static int iwl_led_associate(struct iwl_priv *priv, int led_id) | 170 | static int iwl_led_associate(struct iwl_priv *priv, int led_id) |
171 | { | 171 | { |
172 | IWL_DEBUG_LED("Associated\n"); | 172 | IWL_DEBUG_LED(priv, "Associated\n"); |
173 | priv->allow_blinking = 1; | 173 | priv->allow_blinking = 1; |
174 | return iwl4965_led_on_reg(priv, led_id); | 174 | return iwl4965_led_on_reg(priv, led_id); |
175 | } | 175 | } |
@@ -213,7 +213,7 @@ static void iwl_led_brightness_set(struct led_classdev *led_cdev, | |||
213 | return; | 213 | return; |
214 | 214 | ||
215 | 215 | ||
216 | IWL_DEBUG_LED("Led type = %s brightness = %d\n", | 216 | IWL_DEBUG_LED(priv, "Led type = %s brightness = %d\n", |
217 | led_type_str[led->type], brightness); | 217 | led_type_str[led->type], brightness); |
218 | switch (brightness) { | 218 | switch (brightness) { |
219 | case LED_FULL: | 219 | case LED_FULL: |
@@ -280,7 +280,7 @@ static int iwl_get_blink_rate(struct iwl_priv *priv) | |||
280 | if (tpt < 0) /* wraparound */ | 280 | if (tpt < 0) /* wraparound */ |
281 | tpt = -tpt; | 281 | tpt = -tpt; |
282 | 282 | ||
283 | IWL_DEBUG_LED("tpt %lld current_tpt %llu\n", | 283 | IWL_DEBUG_LED(priv, "tpt %lld current_tpt %llu\n", |
284 | (long long)tpt, | 284 | (long long)tpt, |
285 | (unsigned long long)current_tpt); | 285 | (unsigned long long)current_tpt); |
286 | priv->led_tpt = current_tpt; | 286 | priv->led_tpt = current_tpt; |
@@ -292,7 +292,7 @@ static int iwl_get_blink_rate(struct iwl_priv *priv) | |||
292 | if (tpt > (blink_tbl[i].tpt * IWL_1MB_RATE)) | 292 | if (tpt > (blink_tbl[i].tpt * IWL_1MB_RATE)) |
293 | break; | 293 | break; |
294 | 294 | ||
295 | IWL_DEBUG_LED("LED BLINK IDX=%d\n", i); | 295 | IWL_DEBUG_LED(priv, "LED BLINK IDX=%d\n", i); |
296 | return i; | 296 | return i; |
297 | } | 297 | } |
298 | 298 | ||