Skip to content

Commit

Permalink
wl1271: move wl12xx debugfs directory to under wiphy's debugfs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eliad Peller authored and Luciano Coelho committed Dec 2, 2010
1 parent 7cb2cea commit d60080a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion drivers/net/wireless/wl12xx/debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/wl12xx/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit d60080a

Please sign in to comment.