ath9k: move spectral.* to common-spectral.*

and rename exports from ath9k_spectral_* to ath9k_cmn_spectral_*

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile
index 22b934b..4739722 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/Makefile
+++ b/drivers/net/wireless/ath/ath9k/Makefile
@@ -16,8 +16,7 @@ ath9k-$(CONFIG_ATH9K_DFS_CERTIFIED) += dfs.o
 ath9k-$(CONFIG_ATH9K_TX99) += tx99.o
 ath9k-$(CONFIG_ATH9K_WOW) += wow.o
 
-ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o \
-                                spectral.o
+ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o
 
 ath9k-$(CONFIG_ATH9K_STATION_STATISTICS) += debug_sta.o
 
@@ -59,7 +58,8 @@ obj-$(CONFIG_ATH9K_COMMON) += ath9k_common.o
 ath9k_common-y:=       common.o \
                        common-init.o \
                        common-beacon.o \
-                       common-debug.o
+                       common-debug.o \
+                       common-spectral.o
 
 ath9k_htc-y += htc_hst.o \
                hif_usb.o \

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index dee1f2a..d5a2019 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -28,7 +28,6 @@
 #include "debug.h"
 #include "mci.h"
 #include "dfs.h"
-#include "spectral.h"
 
 struct ath_node;
 struct ath_vif;

diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c
index 32ce931..1dadf6d 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/channel.c
+++ b/drivers/net/wireless/ath/ath9k/channel.c
@@ -93,7 +93,7 @@ static int ath_set_channel(struct ath_softc *sc)
                /* perform spectral scan if requested. */
                if (test_bit(ATH_OP_SCANNING, &common->op_flags) &&
                        sc->spec_priv.spectral_mode == SPECTRAL_CHANSCAN)
-                       ath9k_spectral_scan_trigger(common, &sc->spec_priv);
+                       ath9k_cmn_spectral_scan_trigger(common, &sc->spec_priv);
        }
 
        return 0;

diff --git a/drivers/net/wireless/ath/ath9k/spectral.c b/drivers/net/wireless/ath/ath9k/common-spectral.c
similarity index 94%
rename from drivers/net/wireless/ath/ath9k/spectral.c
rename to drivers/net/wireless/ath/ath9k/common-spectral.c
index bf85740..ec93ddf 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/spectral.c
+++ b/drivers/net/wireless/ath/ath9k/common-spectral.c
@@ -37,7 +37,7 @@ static void ath_debug_send_fft_sample(struct ath_spec_scan_priv *spec_priv,
 }
 
 /* returns 1 if this was a spectral frame, even if not handled. */
-int ath_process_fft(struct ath_spec_scan_priv *spec_priv, struct ieee80211_hdr *hdr,
+int ath_cmn_process_fft(struct ath_spec_scan_priv *spec_priv, struct ieee80211_hdr *hdr,
                    struct ath_rx_status *rs, u64 tsf)
 {
        struct ath_hw *ah = spec_priv->ah;
@@ -204,6 +204,7 @@ int ath_process_fft(struct ath_spec_scan_priv *spec_priv, struct ieee80211_hdr *
 
        return 1;
 }
+EXPORT_SYMBOL(ath_cmn_process_fft);
 
 /*********************/
 /* spectral_scan_ctl */
@@ -234,7 +235,7 @@ static ssize_t read_file_spec_scan_ctl(struct file *file, char __user *user_buf,
        return simple_read_from_buffer(user_buf, count, ppos, mode, len);
 }
 
-void ath9k_spectral_scan_trigger(struct ath_common *common,
+void ath9k_cmn_spectral_scan_trigger(struct ath_common *common,
                                 struct ath_spec_scan_priv *spec_priv)
 {
        struct ath_hw *ah = spec_priv->ah;
@@ -259,12 +260,13 @@ void ath9k_spectral_scan_trigger(struct ath_common *common,
         * configuration, otherwise the register will have its values reset
         * (on my ar9220 to value 0x01002310)
         */
-       ath9k_spectral_scan_config(common, spec_priv, spec_priv->spectral_mode);
+       ath9k_cmn_spectral_scan_config(common, spec_priv, spec_priv->spectral_mode);
        ath9k_hw_ops(ah)->spectral_scan_trigger(ah);
        ath_ps_ops(common)->restore(common);
 }
+EXPORT_SYMBOL(ath9k_cmn_spectral_scan_trigger);
 
-int ath9k_spectral_scan_config(struct ath_common *common,
+int ath9k_cmn_spectral_scan_config(struct ath_common *common,
                               struct ath_spec_scan_priv *spec_priv,
                               enum spectral_mode spectral_mode)
 {
@@ -303,6 +305,7 @@ int ath9k_spectral_scan_config(struct ath_common *common,
 
        return 0;
 }
+EXPORT_SYMBOL(ath9k_cmn_spectral_scan_config);
 
 static ssize_t write_file_spec_scan_ctl(struct file *file,
                                        const char __user *user_buf,
@@ -323,18 +326,18 @@ static ssize_t write_file_spec_scan_ctl(struct file *file,
        buf[len] = '\0';
 
        if (strncmp("trigger", buf, 7) == 0) {
-               ath9k_spectral_scan_trigger(common, spec_priv);
+               ath9k_cmn_spectral_scan_trigger(common, spec_priv);
        } else if (strncmp("background", buf, 10) == 0) {
-               ath9k_spectral_scan_config(common, spec_priv, SPECTRAL_BACKGROUND);
+               ath9k_cmn_spectral_scan_config(common, spec_priv, SPECTRAL_BACKGROUND);
                ath_dbg(common, CONFIG, "spectral scan: background mode enabled\n");
        } else if (strncmp("chanscan", buf, 8) == 0) {
-               ath9k_spectral_scan_config(common, spec_priv, SPECTRAL_CHANSCAN);
+               ath9k_cmn_spectral_scan_config(common, spec_priv, SPECTRAL_CHANSCAN);
                ath_dbg(common, CONFIG, "spectral scan: channel scan mode enabled\n");
        } else if (strncmp("manual", buf, 6) == 0) {
-               ath9k_spectral_scan_config(common, spec_priv, SPECTRAL_MANUAL);
+               ath9k_cmn_spectral_scan_config(common, spec_priv, SPECTRAL_MANUAL);
                ath_dbg(common, CONFIG, "spectral scan: manual mode enabled\n");
        } else if (strncmp("disable", buf, 7) == 0) {
-               ath9k_spectral_scan_config(common, spec_priv, SPECTRAL_DISABLED);
+               ath9k_cmn_spectral_scan_config(common, spec_priv, SPECTRAL_DISABLED);
                ath_dbg(common, CONFIG, "spectral scan: disabled\n");
        } else {
                return -EINVAL;
@@ -577,15 +580,17 @@ static struct rchan_callbacks rfs_spec_scan_cb = {
 /* Debug Init/Deinit */
 /*********************/
 
-void ath9k_spectral_deinit_debug(struct ath_spec_scan_priv *spec_priv)
+void ath9k_cmn_spectral_deinit_debug(struct ath_spec_scan_priv *spec_priv)
 {
        if (config_enabled(CONFIG_ATH9K_DEBUGFS) && spec_priv->rfs_chan_spec_scan) {
                relay_close(spec_priv->rfs_chan_spec_scan);
                spec_priv->rfs_chan_spec_scan = NULL;
        }
 }
+EXPORT_SYMBOL(ath9k_cmn_spectral_deinit_debug);
 
-void ath9k_spectral_init_debug(struct ath_spec_scan_priv *spec_priv, struct dentry *debugfs_phy)
+void ath9k_cmn_spectral_init_debug(struct ath_spec_scan_priv *spec_priv,
+                                  struct dentry *debugfs_phy)
 {
        spec_priv->rfs_chan_spec_scan = relay_open("spectral_scan",
                                            debugfs_phy,
@@ -612,3 +617,4 @@ void ath9k_spectral_init_debug(struct ath_spec_scan_priv *spec_priv, struct dent
                            debugfs_phy, spec_priv,
                            &fops_spectral_fft_period);
 }
+EXPORT_SYMBOL(ath9k_cmn_spectral_init_debug);

diff --git a/drivers/net/wireless/ath/ath9k/spectral.h b/drivers/net/wireless/ath/ath9k/common-spectral.h
similarity index 90%
rename from drivers/net/wireless/ath/ath9k/spectral.h
rename to drivers/net/wireless/ath/ath9k/common-spectral.h
index 77582cf..214c3ba 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/spectral.h
+++ b/drivers/net/wireless/ath/ath9k/common-spectral.h
@@ -130,20 +130,20 @@ static inline u8 spectral_bitmap_weight(u8 *bins)
        return bins[0] & 0x3f;
 }
 
-void ath9k_spectral_init_debug(struct ath_spec_scan_priv *spec_priv, struct dentry *debugfs_phy);
-void ath9k_spectral_deinit_debug(struct ath_spec_scan_priv *spec_priv);
+void ath9k_cmn_spectral_init_debug(struct ath_spec_scan_priv *spec_priv, struct dentry *debugfs_phy);
+void ath9k_cmn_spectral_deinit_debug(struct ath_spec_scan_priv *spec_priv);
 
-void ath9k_spectral_scan_trigger(struct ath_common *common,
+void ath9k_cmn_spectral_scan_trigger(struct ath_common *common,
                                 struct ath_spec_scan_priv *spec_priv);
-int ath9k_spectral_scan_config(struct ath_common *common,
+int ath9k_cmn_spectral_scan_config(struct ath_common *common,
                               struct ath_spec_scan_priv *spec_priv,
                               enum spectral_mode spectral_mode);
 
 #ifdef CONFIG_ATH9K_DEBUGFS
-int ath_process_fft(struct ath_spec_scan_priv *spec_priv, struct ieee80211_hdr *hdr,
+int ath_cmn_process_fft(struct ath_spec_scan_priv *spec_priv, struct ieee80211_hdr *hdr,
                    struct ath_rx_status *rs, u64 tsf);
 #else
-static inline int ath_process_fft(struct ath_spec_scan_priv *spec_priv,
+static inline int ath_cmn_process_fft(struct ath_spec_scan_priv *spec_priv,
                                  struct ieee80211_hdr *hdr,
                                  struct ath_rx_status *rs, u64 tsf)
 {

diff --git a/drivers/net/wireless/ath/ath9k/common.h b/drivers/net/wireless/ath/ath9k/common.h
index ffc454b..2b79a56 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/common.h
+++ b/drivers/net/wireless/ath/ath9k/common.h
@@ -24,6 +24,7 @@
 #include "common-init.h"
 #include "common-beacon.h"
 #include "common-debug.h"
+#include "common-spectral.h"
 
 /* Common header for Atheros 802.11n base driver cores */
 

diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 6492619..db38840 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -1310,7 +1310,7 @@ void ath9k_get_et_stats(struct ieee80211_hw *hw,
 
 void ath9k_deinit_debug(struct ath_softc *sc)
 {
-       ath9k_spectral_deinit_debug(&sc->spec_priv);
+       ath9k_cmn_spectral_deinit_debug(&sc->spec_priv);
 }
 
 int ath9k_init_debug(struct ath_hw *ah)
@@ -1330,7 +1330,7 @@ int ath9k_init_debug(struct ath_hw *ah)
 
        ath9k_dfs_init_debug(sc);
        ath9k_tx99_init_debug(sc);
-       ath9k_spectral_init_debug(&sc->spec_priv, sc->debug.debugfs_phy);
+       ath9k_cmn_spectral_init_debug(&sc->spec_priv, sc->debug.debugfs_phy);
 
        debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
                            &fops_dma);

diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index e97c693..7395afb 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -870,7 +870,7 @@ static int ath9k_rx_skb_preprocess(struct ath_softc *sc,
         */
        if (rx_stats->rs_status & ATH9K_RXERR_PHY) {
                ath9k_dfs_process_phyerr(sc, hdr, rx_stats, rx_status->mactime);
-               if (ath_process_fft(&sc->spec_priv, hdr, rx_stats, rx_status->mactime))
+               if (ath_cmn_process_fft(&sc->spec_priv, hdr, rx_stats, rx_status->mactime))
                        RX_STAT_INC(rx_spectral);
 
                return -EINVAL;