ath10k: module parameter fine tuning
cover ath10k: module parameter fine tuning
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(-)
PATCH 1/2 ath10k: rename debug_mask
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.
--- 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(-)
drivers/net/wireless/ath/ath10k/core.c +2 -2
@@ -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" );
drivers/net/wireless/ath/ath10k/debug.c +2 -2
@@ -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);
drivers/net/wireless/ath/ath10k/debug.h +1 -1
@@ -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, ...);
PATCH 2/2 ath10k: rename ath10k_p2p module parameter to p2p
In reply to Kalle ValoAFAICS 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.
--- drivers/net/wireless/ath/ath10k/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath10k/core.c +2 -2
@@ -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[] = { {
Kalle Valo
Appliedcover ath10k: module parameter fine tuning
In reply to Kalle ValoQuoted 8 lines · Kalle Valo
When running some build tests I found few issues releated to module parameters.
---
Kalle Valo (2):
ath10k: renamedebug_mask
ath10k: renameath10k_p2pmodule parameter to p2p
Applied.
Signature · 1 line
Kalle Valo