aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-5000.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-10-02 16:44:03 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-07 16:39:45 -0400
commite932a609e9759cc75db0c234f465a5fd6e20d362 (patch)
treefb4f7d072aa527204f7db4fd11b155e3b12e0b74 /drivers/net/wireless/iwlwifi/iwl-5000.c
parentbe1a71a128ed91372d4ad8d54d8fd972a1a356eb (diff)
iwlwifi: LED cleanup
The iwlwifi drivers have LED blinking requirements that mac80211 cannot fulfill due to the use of just a single LED instead of different ones for TX, RX, radio etc. Instead, the single LED blinks according to transfers and is solid on the rest of the time. As such, having LED class devices registered that mac80211 triggers are connected to is pointless as we don't use the triggers anyway. Remove all the useless code and add hooks into the driver itself. At the same time, make the LED code abstracted so the core code that determines blink rate etc. can be shared between 3945 and agn in iwlcore. At the same time, the fact that we removed the use of the mac80211 LED triggers means we can also remove the IWLWIFI_LEDS Kconfig symbol since the LED support is now self-contained. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> 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-5000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-5000.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 01d53ebb96ad..624853503db1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -42,6 +42,7 @@
42#include "iwl-io.h" 42#include "iwl-io.h"
43#include "iwl-sta.h" 43#include "iwl-sta.h"
44#include "iwl-helpers.h" 44#include "iwl-helpers.h"
45#include "iwl-agn-led.h"
45#include "iwl-5000-hw.h" 46#include "iwl-5000-hw.h"
46#include "iwl-6000-hw.h" 47#include "iwl-6000-hw.h"
47 48
@@ -1641,11 +1642,12 @@ static struct iwl_lib_ops iwl5150_lib = {
1641 }, 1642 },
1642}; 1643};
1643 1644
1644struct iwl_ops iwl5000_ops = { 1645static struct iwl_ops iwl5000_ops = {
1645 .ucode = &iwl5000_ucode, 1646 .ucode = &iwl5000_ucode,
1646 .lib = &iwl5000_lib, 1647 .lib = &iwl5000_lib,
1647 .hcmd = &iwl5000_hcmd, 1648 .hcmd = &iwl5000_hcmd,
1648 .utils = &iwl5000_hcmd_utils, 1649 .utils = &iwl5000_hcmd_utils,
1650 .led = &iwlagn_led_ops,
1649}; 1651};
1650 1652
1651static struct iwl_ops iwl5150_ops = { 1653static struct iwl_ops iwl5150_ops = {
@@ -1653,6 +1655,7 @@ static struct iwl_ops iwl5150_ops = {
1653 .lib = &iwl5150_lib, 1655 .lib = &iwl5150_lib,
1654 .hcmd = &iwl5000_hcmd, 1656 .hcmd = &iwl5000_hcmd,
1655 .utils = &iwl5000_hcmd_utils, 1657 .utils = &iwl5000_hcmd_utils,
1658 .led = &iwlagn_led_ops,
1656}; 1659};
1657 1660
1658struct iwl_mod_params iwl50_mod_params = { 1661struct iwl_mod_params iwl50_mod_params = {