wlcore/wl12xx/wl18xx: move lower driver debugfs to a subdir

Instead of adding more files from the lower drivers into the same
directory in debugfs as wlcore, we now add a subdirectory for the
lower driver.  This makes things a bit easier, because we can quickly
see where the debugfs entry is implemented and what is specific to the
lower driver.

Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>

diff --git a/drivers/net/wireless/ti/wl12xx/debugfs.c b/drivers/net/wireless/ti/wl12xx/debugfs.c
index 311703d5af84f4bc934df93f425ba0518c68d2f7..0521cbf858cf28e1b7b60b38cb01cc1fb76ed59e 100644 (file)
--- a/drivers/net/wireless/ti/wl12xx/debugfs.c
+++ b/drivers/net/wireless/ti/wl12xx/debugfs.c
@@ -126,9 +126,15 @@ int wl12xx_debugfs_add_files(struct wl1271 *wl,
                             struct dentry *rootdir)
 {
        int ret = 0;
-       struct dentry *entry, *stats;
+       struct dentry *entry, *stats, *moddir;
 
-       stats = debugfs_create_dir("wl12xx_fw_stats", rootdir);
+       moddir = debugfs_create_dir(KBUILD_MODNAME, rootdir);
+       if (!moddir || IS_ERR(moddir)) {
+               entry = moddir;
+               goto err;
+       }
+
+       stats = debugfs_create_dir("fw_stats", moddir);
        if (!stats || IS_ERR(stats)) {
                entry = stats;
                goto err;

diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index 2ac840783551c9fe098e70c7be94aa97f7d1a41b..ba5afa46a430e4501faaaf99b521e0bb780e5fb3 100644 (file)
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -1360,11 +1360,6 @@ out:
        return ret;
 }
 
-static int wl12xx_debugfs_init(struct wl1271 *wl, struct dentry *rootdir)
-{
-       return wl12xx_debugfs_add_files(wl, rootdir);
-}
-
 static struct wlcore_ops wl12xx_ops = {
        .identify_chip          = wl12xx_identify_chip,
        .identify_fw            = wl12xx_identify_fw,
@@ -1387,7 +1382,7 @@ static struct wlcore_ops wl12xx_ops = {
        .set_tx_desc_csum       = wl12xx_set_tx_desc_csum,
        .set_rx_csum            = NULL,
        .ap_get_mimo_wide_rate_mask = NULL,
-       .debugfs_init           = wl12xx_debugfs_init,
+       .debugfs_init           = wl12xx_debugfs_add_files,
 };
 
 static struct ieee80211_sta_ht_cap wl12xx_ht_cap = {

diff --git a/drivers/net/wireless/ti/wl18xx/debugfs.c b/drivers/net/wireless/ti/wl18xx/debugfs.c
index 8354dfc64bd860134c8b4c596c63fa8c4362665f..f4127bfb96423d4425329b90b41e5a45b1d8f850 100644 (file)
--- a/drivers/net/wireless/ti/wl18xx/debugfs.c
+++ b/drivers/net/wireless/ti/wl18xx/debugfs.c
@@ -181,9 +181,15 @@ int wl18xx_debugfs_add_files(struct wl1271 *wl,
                             struct dentry *rootdir)
 {
        int ret = 0;
-       struct dentry *entry, *stats;
+       struct dentry *entry, *stats, *moddir;
 
-       stats = debugfs_create_dir("wl18xx_fw_stats", rootdir);
+       moddir = debugfs_create_dir(KBUILD_MODNAME, rootdir);
+       if (!moddir || IS_ERR(moddir)) {
+               entry = moddir;
+               goto err;
+       }
+
+       stats = debugfs_create_dir("fw_stats", moddir);
        if (!stats || IS_ERR(stats)) {
                entry = stats;
                goto err;

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 524f44c4b991e62f51c647b82e11f7299b9f2736..27cd9b8a6e85186eefeeaec36679d496539990a9 100644 (file)
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -1022,11 +1022,6 @@ static void wl18xx_get_mac(struct wl1271 *wl)
        wlcore_set_partition(wl, &wl->ptable[PART_DOWN]);
 }
 
-static int wl18xx_debugfs_init(struct wl1271 *wl, struct dentry *rootdir)
-{
-       return wl18xx_debugfs_add_files(wl, rootdir);
-}
-
 static int wl18xx_handle_static_data(struct wl1271 *wl,
                                     struct wl1271_static_data *static_data)
 {
@@ -1058,7 +1053,7 @@ static struct wlcore_ops wl18xx_ops = {
        .sta_get_ap_rate_mask = wl18xx_sta_get_ap_rate_mask,
        .ap_get_mimo_wide_rate_mask = wl18xx_ap_get_mimo_wide_rate_mask,
        .get_mac        = wl18xx_get_mac,
-       .debugfs_init   = wl18xx_debugfs_init,
+       .debugfs_init   = wl18xx_debugfs_add_files,
        .handle_static_data     = wl18xx_handle_static_data,
 };