diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-10-02 16:44:03 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-07 16:39:45 -0400 |
commit | e932a609e9759cc75db0c234f465a5fd6e20d362 (patch) | |
tree | fb4f7d072aa527204f7db4fd11b155e3b12e0b74 /drivers/net/wireless/iwlwifi/iwl-debugfs.c | |
parent | be1a71a128ed91372d4ad8d54d8fd972a1a356eb (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-debugfs.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index fa6371d171c5..1794b9c4e6ac 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -677,7 +677,6 @@ static ssize_t iwl_dbgfs_qos_read(struct file *file, char __user *user_buf, | |||
677 | return ret; | 677 | return ret; |
678 | } | 678 | } |
679 | 679 | ||
680 | #ifdef CONFIG_IWLWIFI_LEDS | ||
681 | static ssize_t iwl_dbgfs_led_read(struct file *file, char __user *user_buf, | 680 | static ssize_t iwl_dbgfs_led_read(struct file *file, char __user *user_buf, |
682 | size_t count, loff_t *ppos) | 681 | size_t count, loff_t *ppos) |
683 | { | 682 | { |
@@ -702,7 +701,6 @@ static ssize_t iwl_dbgfs_led_read(struct file *file, char __user *user_buf, | |||
702 | ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); | 701 | ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); |
703 | return ret; | 702 | return ret; |
704 | } | 703 | } |
705 | #endif | ||
706 | 704 | ||
707 | static ssize_t iwl_dbgfs_thermal_throttling_read(struct file *file, | 705 | static ssize_t iwl_dbgfs_thermal_throttling_read(struct file *file, |
708 | char __user *user_buf, | 706 | char __user *user_buf, |
@@ -866,9 +864,7 @@ DEBUGFS_READ_FILE_OPS(channels); | |||
866 | DEBUGFS_READ_FILE_OPS(status); | 864 | DEBUGFS_READ_FILE_OPS(status); |
867 | DEBUGFS_READ_WRITE_FILE_OPS(interrupt); | 865 | DEBUGFS_READ_WRITE_FILE_OPS(interrupt); |
868 | DEBUGFS_READ_FILE_OPS(qos); | 866 | DEBUGFS_READ_FILE_OPS(qos); |
869 | #ifdef CONFIG_IWLWIFI_LEDS | ||
870 | DEBUGFS_READ_FILE_OPS(led); | 867 | DEBUGFS_READ_FILE_OPS(led); |
871 | #endif | ||
872 | DEBUGFS_READ_FILE_OPS(thermal_throttling); | 868 | DEBUGFS_READ_FILE_OPS(thermal_throttling); |
873 | DEBUGFS_READ_WRITE_FILE_OPS(disable_ht40); | 869 | DEBUGFS_READ_WRITE_FILE_OPS(disable_ht40); |
874 | DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override); | 870 | DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override); |
@@ -1666,9 +1662,7 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) | |||
1666 | DEBUGFS_ADD_FILE(status, data); | 1662 | DEBUGFS_ADD_FILE(status, data); |
1667 | DEBUGFS_ADD_FILE(interrupt, data); | 1663 | DEBUGFS_ADD_FILE(interrupt, data); |
1668 | DEBUGFS_ADD_FILE(qos, data); | 1664 | DEBUGFS_ADD_FILE(qos, data); |
1669 | #ifdef CONFIG_IWLWIFI_LEDS | ||
1670 | DEBUGFS_ADD_FILE(led, data); | 1665 | DEBUGFS_ADD_FILE(led, data); |
1671 | #endif | ||
1672 | DEBUGFS_ADD_FILE(sleep_level_override, data); | 1666 | DEBUGFS_ADD_FILE(sleep_level_override, data); |
1673 | DEBUGFS_ADD_FILE(current_sleep_command, data); | 1667 | DEBUGFS_ADD_FILE(current_sleep_command, data); |
1674 | DEBUGFS_ADD_FILE(thermal_throttling, data); | 1668 | DEBUGFS_ADD_FILE(thermal_throttling, data); |
@@ -1721,9 +1715,7 @@ void iwl_dbgfs_unregister(struct iwl_priv *priv) | |||
1721 | DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_status); | 1715 | DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_status); |
1722 | DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_interrupt); | 1716 | DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_interrupt); |
1723 | DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_qos); | 1717 | DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_qos); |
1724 | #ifdef CONFIG_IWLWIFI_LEDS | ||
1725 | DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_led); | 1718 | DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_led); |
1726 | #endif | ||
1727 | DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_thermal_throttling); | 1719 | DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_thermal_throttling); |
1728 | DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_disable_ht40); | 1720 | DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_disable_ht40); |
1729 | DEBUGFS_REMOVE(priv->dbgfs->dir_data); | 1721 | DEBUGFS_REMOVE(priv->dbgfs->dir_data); |