From d74924ea4715483e52cf2a5c42fc6d8226f5d0f1 Mon Sep 17 00:00:00 2001 From: Guy Eilam Date: Wed, 12 Jan 2011 10:33:29 +0100 Subject: [PATCH] --- yaml --- r: 236895 b: refs/heads/master c: 491bbd6bdddafb49d0d6a9258d53441aee4bb622 h: refs/heads/master i: 236893: e3dae32ae8153b161e924e9aad070499e486d094 236891: bac9c128e80999479ccad52758de0e7f0eb70bf5 236887: 076c4f886789f025140e851665cb0e4294648638 236879: 0c71d6af0a71007df41e8ff01608ec51f75906ed 236863: dc86abe2eb975da6f677ecb3918b4752d5f4c7c6 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/debugfs.c | 5 ----- trunk/drivers/net/wireless/wl12xx/main.c | 4 ++-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 7a7f2a5b0f0b..4e007515aef9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d6e4e76d1e73886cb087142e70e2beaabb94b79 +refs/heads/master: 491bbd6bdddafb49d0d6a9258d53441aee4bb622 diff --git a/trunk/drivers/net/wireless/wl12xx/debugfs.c b/trunk/drivers/net/wireless/wl12xx/debugfs.c index 36e7ec1e0c3b..dc3ca0031817 100644 --- a/trunk/drivers/net/wireless/wl12xx/debugfs.c +++ b/trunk/drivers/net/wireless/wl12xx/debugfs.c @@ -402,11 +402,6 @@ static int wl1271_debugfs_add_files(struct wl1271 *wl, DEBUGFS_ADD(gpio_power, rootdir); - entry = debugfs_create_x32("debug_level", 0600, rootdir, - &wl12xx_debug_level); - if (!entry || IS_ERR(entry)) - goto err; - return 0; err: diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c index 2192e4cf62f4..907655504983 100644 --- a/trunk/drivers/net/wireless/wl12xx/main.c +++ b/trunk/drivers/net/wireless/wl12xx/main.c @@ -3334,9 +3334,9 @@ int wl1271_free_hw(struct wl1271 *wl) } EXPORT_SYMBOL_GPL(wl1271_free_hw); -u32 wl12xx_debug_level; +u32 wl12xx_debug_level = DEBUG_NONE; EXPORT_SYMBOL_GPL(wl12xx_debug_level); -module_param_named(debug_level, wl12xx_debug_level, uint, DEBUG_NONE); +module_param_named(debug_level, wl12xx_debug_level, uint, S_IRUSR | S_IWUSR); MODULE_PARM_DESC(debug_level, "wl12xx debugging level"); MODULE_LICENSE("GPL");