diff options
| author | Tony Truong <truong@codeaurora.org> | 2015-11-16 14:49:38 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:24:43 -0700 |
| commit | 44bbb50c5985139c0a8a36e90f61aa1c10edd624 (patch) | |
| tree | 9b877789c2f5a04d853de78e61cbfff00c8b5f5e /drivers/net | |
| parent | 39e32e5185a32adfb90b2cf915c92cf11cb16c1f (diff) | |
mhi: Enable logging based on defconfig option
Enable logging based on MHI defconfig option. This
avoids excessive logging in secondary boot image.
Change-Id: Ie22d56d781feadb2d484e6117c9c25ee29aa5299
Signed-off-by: Andrei Danaila <adanaila@codeaurora.org>
Signed-off-by: Tony Truong <truong@codeaurora.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/msm/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/msm/msm_rmnet_mhi.c | 26 |
2 files changed, 12 insertions, 15 deletions
diff --git a/drivers/net/ethernet/msm/Makefile b/drivers/net/ethernet/msm/Makefile index 68f956ba7f7e..c5f20f87e066 100644 --- a/drivers/net/ethernet/msm/Makefile +++ b/drivers/net/ethernet/msm/Makefile @@ -2,5 +2,4 @@ # Makefile for the msm networking support. # -ccflags-$(CONFIG_MSM_MHI_DEBUG) := -DDEBUG obj-$(CONFIG_MSM_RMNET_MHI) += msm_rmnet_mhi.o diff --git a/drivers/net/ethernet/msm/msm_rmnet_mhi.c b/drivers/net/ethernet/msm/msm_rmnet_mhi.c index 118acab6c11f..7971e1dc28db 100644 --- a/drivers/net/ethernet/msm/msm_rmnet_mhi.c +++ b/drivers/net/ethernet/msm/msm_rmnet_mhi.c @@ -25,6 +25,7 @@ #include <linux/debugfs.h> #include <linux/ipc_logging.h> #include <linux/device.h> +#include <linux/errno.h> #define RMNET_MHI_DRIVER_NAME "rmnet_mhi" #define RMNET_MHI_DEV_NAME "rmnet_mhi%d" @@ -53,16 +54,18 @@ struct __packed mhi_skb_priv { size_t dma_size; }; -enum DBG_LVL rmnet_ipc_log_lvl = MSG_VERBOSE; enum DBG_LVL rmnet_msg_lvl = MSG_CRITICAL; -static unsigned int rmnet_log_override; + +#ifdef CONFIG_MSM_MHI_DEBUG +enum DBG_LVL rmnet_ipc_log_lvl = MSG_VERBOSE; +#else +enum DBG_LVL rmnet_ipc_log_lvl = MSG_ERROR; +#endif module_param(rmnet_msg_lvl , uint, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(rmnet_msg_lvl, "dbg lvl"); module_param(rmnet_ipc_log_lvl, uint, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(rmnet_ipc_log_lvl, "dbg lvl"); -module_param(rmnet_log_override , uint, S_IRUGO | S_IWUSR); -MODULE_PARM_DESC(rmnet_log_override, "dbg class"); unsigned int mru = MHI_DEFAULT_MRU; module_param(mru, uint, S_IRUGO | S_IWUSR); @@ -71,16 +74,11 @@ MODULE_PARM_DESC(mru, "MRU interface setting"); void *rmnet_ipc_log; #define rmnet_log(_msg_lvl, _msg, ...) do { \ - DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, _msg); \ - if ((rmnet_log_override || \ - unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) &&\ - (_msg_lvl) >= rmnet_msg_lvl) \ - pr_alert("[%s] " _msg, __func__, ##__VA_ARGS__); \ - if ((rmnet_log_override || \ - unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) && \ - rmnet_ipc_log && ((_msg_lvl) >= rmnet_ipc_log_lvl)) \ - ipc_log_string(rmnet_ipc_log, \ - "[%s] " _msg, __func__, ##__VA_ARGS__); \ + if ((_msg_lvl) >= rmnet_msg_lvl) \ + pr_alert("[%s] " _msg, __func__, ##__VA_ARGS__);\ + if (rmnet_ipc_log && ((_msg_lvl) >= rmnet_ipc_log_lvl)) \ + ipc_log_string(rmnet_ipc_log, \ + "[%s] " _msg, __func__, ##__VA_ARGS__); \ } while (0) unsigned long tx_interrupts_count[MHI_RMNET_DEVICE_COUNT]; |