[ath9k-devel] [PATCH 0/2] ath10k: module parameter fine tuning

[ath9k-devel] [PATCH 0/2] ath10k: module parameter fine tuning

[Kalle Valo]

When running some build tests I found few issues releated to
module parameters.

---

Kalle Valo (2):
      ath10k: rename debug_mask
      ath10k: rename ath10k_p2p module parameter to p2p


 drivers/net/wireless/ath/ath10k/core.c  |    8 ++++----
 drivers/net/wireless/ath/ath10k/debug.c |    4 ++--
 drivers/net/wireless/ath/ath10k/debug.h |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

[ath9k-devel] [PATCH 1/2] ath10k: rename debug_mask

[Kalle Valo]

Rename debug_mask variable to ath10k_debug_mask. Fixes a linker error:

drivers/net/wireless/ath/ath10k/built-in.o: In function `ath10k_add_interface':
/home/kvalo/ath10k/src/ath10k/drivers/net/wireless/ath/ath10k/mac.c:1710:
	multiple definition of `debug_mask'
drivers/net/wireless/ath/ath6kl/built-in.o:/home/kvalo/ath10k/src/ath10k/include/linux/list.h:188:
	first defined here

This changes just the variable, the name of kernel module parameters
stays the same.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/core.c  |    4 ++--
 drivers/net/wireless/ath/ath10k/debug.c |    4 ++--
 drivers/net/wireless/ath/ath10k/debug.h |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index a3afb79..d0d8521 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -27,10 +27,10 @@
 #include "debug.h"
 #include "htt.h"
 
-unsigned int debug_mask;
+unsigned int ath10k_debug_mask;
 static bool uart_print;
 static unsigned int ath10k_p2p;
-module_param(debug_mask, uint, 0644);
+module_param_named(debug_mask, ath10k_debug_mask, uint, 0644);
 module_param(uart_print, bool, 0644);
 module_param(ath10k_p2p, uint, 0644);
 MODULE_PARM_DESC(debug_mask, "Debugging mask");
diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index 040cdcd..aa9f66f 100644
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -476,7 +476,7 @@ void ath10k_dbg(enum ath10k_debug_mask mask, const char *fmt, ...)
 	vaf.fmt = fmt;
 	vaf.va = &args;
 
-	if (debug_mask & mask)
+	if (ath10k_debug_mask & mask)
 		ath10k_printk(KERN_DEBUG, "%pV", &vaf);
 
 	trace_ath10k_log_dbg(mask, &vaf);
@@ -489,7 +489,7 @@ void ath10k_dbg_dump(enum ath10k_debug_mask mask,
 		     const char *msg, const char *prefix,
 		     const void *buf, size_t len)
 {
-	if (debug_mask & mask) {
+	if (ath10k_debug_mask & mask) {
 		if (msg)
 			ath10k_dbg(mask, "%s\n", msg);
 
diff --git a/drivers/net/wireless/ath/ath10k/debug.h b/drivers/net/wireless/ath/ath10k/debug.h
index bbaaa37..e7fb640 100644
--- a/drivers/net/wireless/ath/ath10k/debug.h
+++ b/drivers/net/wireless/ath/ath10k/debug.h
@@ -34,7 +34,7 @@ enum ath10k_debug_mask {
 	ATH10K_DBG_ANY		= 0xffffffff,
 };
 
-extern unsigned int debug_mask;
+extern unsigned int ath10k_debug_mask;
 
 extern __printf(1, 2) int ath10k_info(const char *fmt, ...);
 extern __printf(1, 2) int ath10k_err(const char *fmt, ...);

[ath9k-devel] [PATCH 2/2] ath10k: rename ath10k_p2p module parameter to p2p

[Kalle Valo]

AFAICS there's no need to have the ath10k_ prefix in p2p
kernel module parameter so remove that. The name of
the actual variable in code stays the same, ath10k_p2p.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/core.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index d0d8521..5dc02ea 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -32,10 +32,10 @@ static bool uart_print;
 static unsigned int ath10k_p2p;
 module_param_named(debug_mask, ath10k_debug_mask, uint, 0644);
 module_param(uart_print, bool, 0644);
-module_param(ath10k_p2p, uint, 0644);
+module_param_named(p2p, ath10k_p2p, uint, 0644);
 MODULE_PARM_DESC(debug_mask, "Debugging mask");
 MODULE_PARM_DESC(uart_print, "Uart target debugging");
-MODULE_PARM_DESC(ath10k_p2p, "Enable ath10k P2P support");
+MODULE_PARM_DESC(p2p, "Enable ath10k P2P support");
 
 static const struct ath10k_hw_params ath10k_hw_params_list[] = {
 	{

[ath9k-devel] [PATCH 0/2] ath10k: module parameter fine tuning

[Kalle Valo]

Kalle Valo <kvalo@qca.qualcomm.com> writes:

> When running some build tests I found few issues releated to
> module parameters.
>
> ---
>
> Kalle Valo (2):
>       ath10k: rename debug_mask
>       ath10k: rename ath10k_p2p module parameter to p2p

Applied.

-- 
Kalle Valo