ath9k: move recv to ath9k_cmn_debug_recv

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/common-debug.c b/drivers/net/wireless/ath/ath9k/common-debug.c
index ef538d23b18cbd4871ba5166ac4a98ce65bb6ec6..1d4158a8ea6bd2e9479c54e2c5fd08635714079e 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/common-debug.c
+++ b/drivers/net/wireless/ath/ath9k/common-debug.c
@@ -119,3 +119,66 @@ void ath9k_cmn_debug_stat_rx(struct ath_rx_stats *rxstats,
 #undef RX_PHY_ERR_INC
 }
 EXPORT_SYMBOL(ath9k_cmn_debug_stat_rx);
+
+static ssize_t read_file_recv(struct file *file, char __user *user_buf,
+                             size_t count, loff_t *ppos)
+{
+#define RXS_ERR(s, e)                                  \
+       do {                                            \
+               len += scnprintf(buf + len, size - len, \
+                                "%18s : %10u\n", s,    \
+                                rxstats->e);           \
+       } while (0)
+
+       struct ath_rx_stats *rxstats = file->private_data;
+       char *buf;
+       unsigned int len = 0, size = 1600;
+       ssize_t retval = 0;
+
+       buf = kzalloc(size, GFP_KERNEL);
+       if (buf == NULL)
+               return -ENOMEM;
+
+       RXS_ERR("PKTS-ALL", rx_pkts_all);
+       RXS_ERR("BYTES-ALL", rx_bytes_all);
+       RXS_ERR("BEACONS", rx_beacons);
+       RXS_ERR("FRAGS", rx_frags);
+       RXS_ERR("SPECTRAL", rx_spectral);
+
+       RXS_ERR("CRC ERR", crc_err);
+       RXS_ERR("DECRYPT CRC ERR", decrypt_crc_err);
+       RXS_ERR("PHY ERR", phy_err);
+       RXS_ERR("MIC ERR", mic_err);
+       RXS_ERR("PRE-DELIM CRC ERR", pre_delim_crc_err);
+       RXS_ERR("POST-DELIM CRC ERR", post_delim_crc_err);
+       RXS_ERR("DECRYPT BUSY ERR", decrypt_busy_err);
+       RXS_ERR("LENGTH-ERR", rx_len_err);
+       RXS_ERR("OOM-ERR", rx_oom_err);
+       RXS_ERR("RATE-ERR", rx_rate_err);
+       RXS_ERR("TOO-MANY-FRAGS", rx_too_many_frags_err);
+
+       if (len > size)
+               len = size;
+
+       retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
+       kfree(buf);
+
+       return retval;
+
+#undef RXS_ERR
+}
+
+static const struct file_operations fops_recv = {
+       .read = read_file_recv,
+       .open = simple_open,
+       .owner = THIS_MODULE,
+       .llseek = default_llseek,
+};
+
+void ath9k_cmn_debug_recv(struct dentry *debugfs_phy,
+                         struct ath_rx_stats *rxstats)
+{
+       debugfs_create_file("recv", S_IRUSR, debugfs_phy, rxstats,
+                           &fops_recv);
+}
+EXPORT_SYMBOL(ath9k_cmn_debug_recv);

diff --git a/drivers/net/wireless/ath/ath9k/common-debug.h b/drivers/net/wireless/ath/ath9k/common-debug.h
index 2fcd307a9a8af1c1e87721495bb5a1aa27446fc6..32b89f68ccaffeb416269636f3e81c122a7dff89 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/common-debug.h
+++ b/drivers/net/wireless/ath/ath9k/common-debug.h
@@ -66,3 +66,5 @@ void ath9k_cmn_debug_base_eeprom(struct dentry *debugfs_phy,
                                 struct ath_hw *ah);
 void ath9k_cmn_debug_stat_rx(struct ath_rx_stats *rxstats,
                             struct ath_rx_status *rs);
+void ath9k_cmn_debug_recv(struct dentry *debugfs_phy,
+                         struct ath_rx_stats *rxstats);

diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index be29e71625cd6b8d2301c041a5eaf7577e1e9aa9..b96119f813bfb1fd57ce0954d86021348abd30ac 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -948,66 +948,11 @@ static const struct file_operations fops_reset = {
        .llseek = default_llseek,
 };
 
-static ssize_t read_file_recv(struct file *file, char __user *user_buf,
-                             size_t count, loff_t *ppos)
-{
-#define RXS_ERR(s, e)                                      \
-       do {                                                \
-               len += scnprintf(buf + len, size - len,     \
-                                "%18s : %10u\n", s,        \
-                                sc->debug.stats.rxstats.e);\
-       } while (0)
-
-       struct ath_softc *sc = file->private_data;
-       char *buf;
-       unsigned int len = 0, size = 1600;
-       ssize_t retval = 0;
-
-       buf = kzalloc(size, GFP_KERNEL);
-       if (buf == NULL)
-               return -ENOMEM;
-
-       RXS_ERR("PKTS-ALL", rx_pkts_all);
-       RXS_ERR("BYTES-ALL", rx_bytes_all);
-       RXS_ERR("BEACONS", rx_beacons);
-       RXS_ERR("FRAGS", rx_frags);
-       RXS_ERR("SPECTRAL", rx_spectral);
-
-       RXS_ERR("CRC ERR", crc_err);
-       RXS_ERR("DECRYPT CRC ERR", decrypt_crc_err);
-       RXS_ERR("PHY ERR", phy_err);
-       RXS_ERR("MIC ERR", mic_err);
-       RXS_ERR("PRE-DELIM CRC ERR", pre_delim_crc_err);
-       RXS_ERR("POST-DELIM CRC ERR", post_delim_crc_err);
-       RXS_ERR("DECRYPT BUSY ERR", decrypt_busy_err);
-       RXS_ERR("LENGTH-ERR", rx_len_err);
-       RXS_ERR("OOM-ERR", rx_oom_err);
-       RXS_ERR("RATE-ERR", rx_rate_err);
-       RXS_ERR("TOO-MANY-FRAGS", rx_too_many_frags_err);
-
-       if (len > size)
-               len = size;
-
-       retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
-       kfree(buf);
-
-       return retval;
-
-#undef RXS_ERR
-}
-
 void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs)
 {
        ath9k_cmn_debug_stat_rx(&sc->debug.stats.rxstats, rs);
 }
 
-static const struct file_operations fops_recv = {
-       .read = read_file_recv,
-       .open = simple_open,
-       .owner = THIS_MODULE,
-       .llseek = default_llseek,
-};
-
 static ssize_t read_file_phy_err(struct file *file, char __user *user_buf,
                                 size_t count, loff_t *ppos)
 {
@@ -1444,8 +1389,9 @@ int ath9k_init_debug(struct ath_hw *ah)
                            &fops_misc);
        debugfs_create_file("reset", S_IRUSR, sc->debug.debugfs_phy, sc,
                            &fops_reset);
-       debugfs_create_file("recv", S_IRUSR, sc->debug.debugfs_phy, sc,
-                           &fops_recv);
+
+       ath9k_cmn_debug_recv(sc->debug.debugfs_phy, &sc->debug.stats.rxstats);
+
        debugfs_create_file("phy_err", S_IRUSR, sc->debug.debugfs_phy, sc,
                            &fops_phy_err);
        debugfs_create_u8("rx_chainmask", S_IRUSR, sc->debug.debugfs_phy,