aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-led.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-led.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-led.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
index 6f5424bd365b..d59ad1844e25 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -40,6 +40,7 @@
40#include <asm/unaligned.h> 40#include <asm/unaligned.h>
41 41
42#include "iwl-4965.h" 42#include "iwl-4965.h"
43#include "iwl-io.h"
43#include "iwl-core.h" 44#include "iwl-core.h"
44#include "iwl-helpers.h" 45#include "iwl-helpers.h"
45 46
@@ -85,9 +86,9 @@ static int iwl_send_led_cmd(struct iwl_priv *priv,
85 }; 86 };
86 u32 reg; 87 u32 reg;
87 88
88 reg = iwl4965_read32(priv, CSR_LED_REG); 89 reg = iwl_read32(priv, CSR_LED_REG);
89 if (reg != (reg & CSR_LED_BSM_CTRL_MSK)) 90 if (reg != (reg & CSR_LED_BSM_CTRL_MSK))
90 iwl4965_write32(priv, CSR_LED_REG, reg & CSR_LED_BSM_CTRL_MSK); 91 iwl_write32(priv, CSR_LED_REG, reg & CSR_LED_BSM_CTRL_MSK);
91 92
92 return iwl_send_cmd(priv, &cmd); 93 return iwl_send_cmd(priv, &cmd);
93} 94}
@@ -126,7 +127,7 @@ static int iwl4965_led_pattern(struct iwl_priv *priv, int led_id,
126static int iwl4965_led_on_reg(struct iwl_priv *priv, int led_id) 127static int iwl4965_led_on_reg(struct iwl_priv *priv, int led_id)
127{ 128{
128 IWL_DEBUG_LED("led on %d\n", led_id); 129 IWL_DEBUG_LED("led on %d\n", led_id);
129 iwl4965_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_ON); 130 iwl_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_ON);
130 return 0; 131 return 0;
131} 132}
132 133
@@ -150,7 +151,7 @@ int iwl4965_led_off(struct iwl_priv *priv, int led_id)
150static int iwl4965_led_off_reg(struct iwl_priv *priv, int led_id) 151static int iwl4965_led_off_reg(struct iwl_priv *priv, int led_id)
151{ 152{
152 IWL_DEBUG_LED("radio off\n"); 153 IWL_DEBUG_LED("radio off\n");
153 iwl4965_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_OFF); 154 iwl_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_OFF);
154 return 0; 155 return 0;
155} 156}
156 157