diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-01-28 11:30:51 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-01-30 15:48:34 -0500 |
commit | dcc3ec04c14d6d840fdcc5be0ddd752a7daf7ec4 (patch) | |
tree | 3ee543638dcea7262571502e8c9a330dc6093539 | |
parent | 2b2db58d65edcab4bcc9d6fdd2770bb0275cdac4 (diff) |
iwlwifi: add option to disalbe LED
Led has no use for some platform.
Add additional module parameter option to disable LED
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-led.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-shared.h | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 3e429a3e518d..90315c69cdf6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -2097,7 +2097,7 @@ MODULE_PARM_DESC(bt_coex_active, "enable wifi/bt co-exist (default: enable)"); | |||
2097 | 2097 | ||
2098 | module_param_named(led_mode, iwlagn_mod_params.led_mode, int, S_IRUGO); | 2098 | module_param_named(led_mode, iwlagn_mod_params.led_mode, int, S_IRUGO); |
2099 | MODULE_PARM_DESC(led_mode, "0=system default, " | 2099 | MODULE_PARM_DESC(led_mode, "0=system default, " |
2100 | "1=On(RF On)/Off(RF Off), 2=blinking (default: 0)"); | 2100 | "1=On(RF On)/Off(RF Off), 2=blinking, 3=Off (default: 0)"); |
2101 | 2101 | ||
2102 | module_param_named(power_save, iwlagn_mod_params.power_save, | 2102 | module_param_named(power_save, iwlagn_mod_params.power_save, |
2103 | bool, S_IRUGO); | 2103 | bool, S_IRUGO); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c index eca79087afb8..8761438f1532 100644 --- a/drivers/net/wireless/iwlwifi/iwl-led.c +++ b/drivers/net/wireless/iwlwifi/iwl-led.c | |||
@@ -177,6 +177,10 @@ void iwl_leds_init(struct iwl_priv *priv) | |||
177 | int mode = iwlagn_mod_params.led_mode; | 177 | int mode = iwlagn_mod_params.led_mode; |
178 | int ret; | 178 | int ret; |
179 | 179 | ||
180 | if (mode == IWL_LED_DISABLE) { | ||
181 | IWL_INFO(priv, "Led disabled\n"); | ||
182 | return; | ||
183 | } | ||
180 | if (mode == IWL_LED_DEFAULT) | 184 | if (mode == IWL_LED_DEFAULT) |
181 | mode = cfg(priv)->led_mode; | 185 | mode = cfg(priv)->led_mode; |
182 | 186 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h index e406d49f4189..04975b7b65b3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/drivers/net/wireless/iwlwifi/iwl-shared.h | |||
@@ -264,11 +264,13 @@ enum iwl_pa_type { | |||
264 | * LED ON = RF ON | 264 | * LED ON = RF ON |
265 | * LED OFF = RF OFF | 265 | * LED OFF = RF OFF |
266 | * IWL_LED_BLINK: adjust led blink rate based on blink table | 266 | * IWL_LED_BLINK: adjust led blink rate based on blink table |
267 | * IWL_LED_DISABLE: led disabled | ||
267 | */ | 268 | */ |
268 | enum iwl_led_mode { | 269 | enum iwl_led_mode { |
269 | IWL_LED_DEFAULT, | 270 | IWL_LED_DEFAULT, |
270 | IWL_LED_RF_STATE, | 271 | IWL_LED_RF_STATE, |
271 | IWL_LED_BLINK, | 272 | IWL_LED_BLINK, |
273 | IWL_LED_DISABLE, | ||
272 | }; | 274 | }; |
273 | 275 | ||
274 | /** | 276 | /** |