[PATCH 1/3] wcn36xx: change debug_mask name

Eugene Krasnikov k.eugene.e at gmail.com
Tue Oct 8 15:33:25 EDT 2013


debug_mask variable name is commonly used in linux.
This is causing to build error when using wcn36xx as
built in module. As a fix change variable name.

Signed-off-by: Eugene Krasnikov <k.eugene.e at gmail.com>
---
 main.c    | 4 ++--
 wcn36xx.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/main.c b/main.c
index df4aca2..56dbb48 100644
--- a/main.c
+++ b/main.c
@@ -21,8 +21,8 @@
 #include <linux/platform_device.h>
 #include "wcn36xx.h"
 
-unsigned int debug_mask;
-module_param(debug_mask, uint, 0644);
+unsigned int wcn36xx_dbg_mask;
+module_param_named(debug_mask, wcn36xx_dbg_mask, uint, 0644);
 MODULE_PARM_DESC(debug_mask, "Debugging mask");
 
 #define CHAN2G(_freq, _idx) { \
diff --git a/wcn36xx.h b/wcn36xx.h
index 40a5797..01737fc 100644
--- a/wcn36xx.h
+++ b/wcn36xx.h
@@ -33,7 +33,7 @@
 #define WLAN_NV_FILE               "wlan/prima/WCNSS_qcom_wlan_nv.bin"
 #define WCN36XX_AGGR_BUFFER_SIZE 64
 
-extern unsigned int debug_mask;
+extern unsigned int wcn36xx_dbg_mask;
 
 enum wcn36xx_debug_mask {
 	WCN36XX_DBG_DXE		= 0x00000001,
@@ -64,12 +64,12 @@ enum wcn36xx_debug_mask {
 	printk(KERN_INFO pr_fmt(fmt), ##arg)
 
 #define wcn36xx_dbg(mask, fmt, arg...) do {			\
-	if (debug_mask & mask)					\
+	if (wcn36xx_dbg_mask & mask)				\
 		printk(KERN_DEBUG pr_fmt(fmt), ##arg);	\
 } while (0)
 
 #define wcn36xx_dbg_dump(mask, prefix_str, buf, len) do {	\
-	if (debug_mask & mask)					\
+	if (wcn36xx_dbg_mask & mask)				\
 		print_hex_dump(KERN_DEBUG, pr_fmt(prefix_str),	\
 			       DUMP_PREFIX_OFFSET, 32, 1,	\
 			       buf, len, false);		\
-- 
1.8.1.2




More information about the wcn36xx mailing list