evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "icnss: Consolidate logging message"

Browse source
This commit is contained in:
Linux Build Service Account 2017-07-26 08:44:54 -07:00 • committed by Gerrit - the friendly Code Review server
commit 2991c52124
1 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
drivers/soc/qcom/icnss.c
View file

@ -84,34 +84,58 @@ module_param(qmi_timeout, ulong, 0600);
} while (0) } while (0)
#define icnss_pr_err(_fmt, ...) do { \ #define icnss_pr_err(_fmt, ...) do { \
pr_err(_fmt, ##__VA_ARGS__); \ printk("%s" pr_fmt(_fmt), KERN_ERR, ##__VA_ARGS__); \
icnss_ipc_log_string("ERR: " pr_fmt(_fmt), \ icnss_ipc_log_string("%s" pr_fmt(_fmt), "", \
##__VA_ARGS__); \ ##__VA_ARGS__); \
} while (0) } while (0)
#define icnss_pr_warn(_fmt, ...) do { \ #define icnss_pr_warn(_fmt, ...) do { \
pr_warn(_fmt, ##__VA_ARGS__); \ printk("%s" pr_fmt(_fmt), KERN_WARNING, ##__VA_ARGS__); \
icnss_ipc_log_string("WRN: " pr_fmt(_fmt), \ icnss_ipc_log_string("%s" pr_fmt(_fmt), "", \
##__VA_ARGS__); \ ##__VA_ARGS__); \
} while (0) } while (0)
#define icnss_pr_info(_fmt, ...) do { \ #define icnss_pr_info(_fmt, ...) do { \
pr_info(_fmt, ##__VA_ARGS__); \ printk("%s" pr_fmt(_fmt), KERN_INFO, ##__VA_ARGS__); \
icnss_ipc_log_string("INF: " pr_fmt(_fmt), \ icnss_ipc_log_string("%s" pr_fmt(_fmt), "", \
##__VA_ARGS__); \ ##__VA_ARGS__); \
} while (0) } while (0)
#if defined(CONFIG_DYNAMIC_DEBUG)
#define icnss_pr_dbg(_fmt, ...) do { \ #define icnss_pr_dbg(_fmt, ...) do { \
pr_debug(_fmt, ##__VA_ARGS__); \ pr_debug(_fmt, ##__VA_ARGS__); \
icnss_ipc_log_string("DBG: " pr_fmt(_fmt), \ icnss_ipc_log_string(pr_fmt(_fmt), ##__VA_ARGS__); \
##__VA_ARGS__); \
} while (0) } while (0)
#define icnss_pr_vdbg(_fmt, ...) do { \ #define icnss_pr_vdbg(_fmt, ...) do { \
pr_debug(_fmt, ##__VA_ARGS__); \ pr_debug(_fmt, ##__VA_ARGS__); \
icnss_ipc_log_long_string("DBG: " pr_fmt(_fmt), \ icnss_ipc_log_long_string(pr_fmt(_fmt), ##__VA_ARGS__); \
##__VA_ARGS__); \
} while (0) } while (0)
#elif defined(DEBUG)
#define icnss_pr_dbg(_fmt, ...) do { \
printk("%s" pr_fmt(_fmt), KERN_DEBUG, ##__VA_ARGS__); \
icnss_ipc_log_string("%s" pr_fmt(_fmt), "", \
##__VA_ARGS__); \
} while (0)
#define icnss_pr_vdbg(_fmt, ...) do { \
printk("%s" pr_fmt(_fmt), KERN_DEBUG, ##__VA_ARGS__); \
icnss_ipc_log_long_string("%s" pr_fmt(_fmt), "", \
##__VA_ARGS__); \
} while (0)
#else
#define icnss_pr_dbg(_fmt, ...) do { \
no_printk("%s" pr_fmt(_fmt), KERN_DEBUG, ##__VA_ARGS__); \
icnss_ipc_log_string("%s" pr_fmt(_fmt), "", \
##__VA_ARGS__); \
} while (0)
#define icnss_pr_vdbg(_fmt, ...) do { \
no_printk("%s" pr_fmt(_fmt), KERN_DEBUG, ##__VA_ARGS__); \
icnss_ipc_log_long_string("%s" pr_fmt(_fmt), "", \
##__VA_ARGS__); \
} while (0)
#endif
#ifdef CONFIG_ICNSS_DEBUG #ifdef CONFIG_ICNSS_DEBUG
#define ICNSS_ASSERT(_condition) do { \ #define ICNSS_ASSERT(_condition) do { \