Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d60080ae authored Nov 24, 2010 by Eliad Peller Committed by Luciano Coelho Dec 02, 2010

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>

parent 7cb2cea9

drivers/net/wireless/wl12xx/debugfs.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/net/wireless/wl12xx/main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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) {