Commit d60080ae authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
parent 7cb2cea9
...@@ -423,7 +423,8 @@ int wl1271_debugfs_init(struct wl1271 *wl) ...@@ -423,7 +423,8 @@ int wl1271_debugfs_init(struct wl1271 *wl)
{ {
int ret; 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)) { if (IS_ERR(wl->rootdir)) {
ret = PTR_ERR(wl->rootdir); ret = PTR_ERR(wl->rootdir);
......
...@@ -2602,6 +2602,8 @@ int wl1271_register_hw(struct wl1271 *wl) ...@@ -2602,6 +2602,8 @@ int wl1271_register_hw(struct wl1271 *wl)
wl->mac80211_registered = true; wl->mac80211_registered = true;
wl1271_debugfs_init(wl);
register_netdevice_notifier(&wl1271_dev_notifier); register_netdevice_notifier(&wl1271_dev_notifier);
wl1271_notice("loaded"); wl1271_notice("loaded");
...@@ -2736,8 +2738,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void) ...@@ -2736,8 +2738,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
/* Apply default driver configuration. */ /* Apply default driver configuration. */
wl1271_conf_init(wl); wl1271_conf_init(wl);
wl1271_debugfs_init(wl);
order = get_order(WL1271_AGGR_BUFFER_SIZE); order = get_order(WL1271_AGGR_BUFFER_SIZE);
wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order); wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order);
if (!wl->aggr_buf) { if (!wl->aggr_buf) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment