wl1271: move wl12xx debugfs directory to under wiphy's debugfs

Use per-device debugfs path, so multiple devices won't collide.

in order to use wl->hw->wiphy->debugfsdir, we have to move the debugfs
creation from wl1271_debugfs_init() to wl1271_register_hw().

Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>

diff --git a/drivers/net/wireless/wl12xx/debugfs.c b/drivers/net/wireless/wl12xx/debugfs.c
index 402df14e091bdc1dccaf817fb17289adaf56f448..2ac289e51484fb920ba77b49e6a15c5cdb55c292 100644 (file)
--- a/drivers/net/wireless/wl12xx/debugfs.c
+++ b/drivers/net/wireless/wl12xx/debugfs.c
@@ -423,7 +423,8 @@ int wl1271_debugfs_init(struct wl1271 *wl)
 {
        int ret;
 
-       wl->rootdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
+       wl->rootdir = debugfs_create_dir(KBUILD_MODNAME,
+                                        wl->hw->wiphy->debugfsdir);
 
        if (IS_ERR(wl->rootdir)) {
                ret = PTR_ERR(wl->rootdir);

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index b2432dab4b51a1a4d5b8ec9252d7f0f0db022c3f..7fecefe8d3c17b243bcdd8305142ced91023fadf 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2602,6 +2602,8 @@ int wl1271_register_hw(struct wl1271 *wl)
 
        wl->mac80211_registered = true;
 
+       wl1271_debugfs_init(wl);
+
        register_netdevice_notifier(&wl1271_dev_notifier);
 
        wl1271_notice("loaded");
@@ -2736,8 +2738,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
        /* Apply default driver configuration. */
        wl1271_conf_init(wl);
 
-       wl1271_debugfs_init(wl);
-
        order = get_order(WL1271_AGGR_BUFFER_SIZE);
        wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order);
        if (!wl->aggr_buf) {