diff options
author | Oleksij Rempel <linux@rempel-privat.de> | 2014-11-06 02:53:38 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-11-11 16:31:15 -0500 |
commit | 3f2aa13f6d16a53a4cf5de369c685c6f75fe4d58 (patch) | |
tree | 305afbb8fe8a3e51cae6d71acaffe4ad5ceff660 | |
parent | 83fb287ecd8ae60ed79c647a5df8beacdf4f4807 (diff) |
ath9k_htc: add spectral scan debug interface
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 1f019aa2d1f8..b34acdeb1f21 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h | |||
@@ -626,8 +626,10 @@ int ath9k_htc_resume(struct htc_target *htc_handle); | |||
626 | #endif | 626 | #endif |
627 | #ifdef CONFIG_ATH9K_HTC_DEBUGFS | 627 | #ifdef CONFIG_ATH9K_HTC_DEBUGFS |
628 | int ath9k_htc_init_debug(struct ath_hw *ah); | 628 | int ath9k_htc_init_debug(struct ath_hw *ah); |
629 | void ath9k_htc_deinit_debug(struct ath9k_htc_priv *priv); | ||
629 | #else | 630 | #else |
630 | static inline int ath9k_htc_init_debug(struct ath_hw *ah) { return 0; }; | 631 | static inline int ath9k_htc_init_debug(struct ath_hw *ah) { return 0; }; |
632 | static inline void ath9k_htc_deinit_debug(struct ath9k_htc_priv *priv) { return 0; }; | ||
631 | #endif /* CONFIG_ATH9K_HTC_DEBUGFS */ | 633 | #endif /* CONFIG_ATH9K_HTC_DEBUGFS */ |
632 | 634 | ||
633 | #endif /* HTC_H */ | 635 | #endif /* HTC_H */ |
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c index 8b529e4b8ac4..8cef1edcc621 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c | |||
@@ -490,6 +490,10 @@ void ath9k_htc_get_et_stats(struct ieee80211_hw *hw, | |||
490 | WARN_ON(i != ATH9K_HTC_SSTATS_LEN); | 490 | WARN_ON(i != ATH9K_HTC_SSTATS_LEN); |
491 | } | 491 | } |
492 | 492 | ||
493 | void ath9k_htc_deinit_debug(struct ath9k_htc_priv *priv) | ||
494 | { | ||
495 | ath9k_cmn_spectral_deinit_debug(&priv->spec_priv); | ||
496 | } | ||
493 | 497 | ||
494 | int ath9k_htc_init_debug(struct ath_hw *ah) | 498 | int ath9k_htc_init_debug(struct ath_hw *ah) |
495 | { | 499 | { |
@@ -501,6 +505,8 @@ int ath9k_htc_init_debug(struct ath_hw *ah) | |||
501 | if (!priv->debug.debugfs_phy) | 505 | if (!priv->debug.debugfs_phy) |
502 | return -ENOMEM; | 506 | return -ENOMEM; |
503 | 507 | ||
508 | ath9k_cmn_spectral_init_debug(&priv->spec_priv, priv->debug.debugfs_phy); | ||
509 | |||
504 | debugfs_create_file("tgt_int_stats", S_IRUSR, priv->debug.debugfs_phy, | 510 | debugfs_create_file("tgt_int_stats", S_IRUSR, priv->debug.debugfs_phy, |
505 | priv, &fops_tgt_int_stats); | 511 | priv, &fops_tgt_int_stats); |
506 | debugfs_create_file("tgt_tx_stats", S_IRUSR, priv->debug.debugfs_phy, | 512 | debugfs_create_file("tgt_tx_stats", S_IRUSR, priv->debug.debugfs_phy, |
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c index 285d0ada369f..ad8f1dcc9cd5 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c | |||
@@ -102,6 +102,7 @@ static void ath9k_deinit_device(struct ath9k_htc_priv *priv) | |||
102 | 102 | ||
103 | wiphy_rfkill_stop_polling(hw->wiphy); | 103 | wiphy_rfkill_stop_polling(hw->wiphy); |
104 | ath9k_deinit_leds(priv); | 104 | ath9k_deinit_leds(priv); |
105 | ath9k_htc_deinit_debug(priv); | ||
105 | ieee80211_unregister_hw(hw); | 106 | ieee80211_unregister_hw(hw); |
106 | ath9k_rx_cleanup(priv); | 107 | ath9k_rx_cleanup(priv); |
107 | ath9k_tx_cleanup(priv); | 108 | ath9k_tx_cleanup(priv); |