Merge "qcacmn: Replace printk with qdf_nofl_info"
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
fb263dc4bd
@@ -27,6 +27,7 @@
|
|||||||
/* Include Files */
|
/* Include Files */
|
||||||
#include <qdf_types.h>
|
#include <qdf_types.h>
|
||||||
#include <i_qdf_mem.h>
|
#include <i_qdf_mem.h>
|
||||||
|
#include <i_qdf_trace.h>
|
||||||
|
|
||||||
#define QDF_CACHE_LINE_SZ __qdf_cache_line_sz
|
#define QDF_CACHE_LINE_SZ __qdf_cache_line_sz
|
||||||
|
|
||||||
@@ -621,7 +622,7 @@ static inline void qdf_update_mem_map_table(qdf_device_t osdev,
|
|||||||
uint32_t mem_size)
|
uint32_t mem_size)
|
||||||
{
|
{
|
||||||
if (!mem_info) {
|
if (!mem_info) {
|
||||||
__qdf_print("%s: NULL mem_info\n", __func__);
|
qdf_nofl_err("%s: NULL mem_info", __func__);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -818,8 +819,8 @@ static inline void qdf_mem_shared_mem_free(qdf_device_t osdev,
|
|||||||
qdf_shared_mem_t *shared_mem)
|
qdf_shared_mem_t *shared_mem)
|
||||||
{
|
{
|
||||||
if (!shared_mem) {
|
if (!shared_mem) {
|
||||||
__qdf_print("%s: NULL shared mem struct passed\n",
|
qdf_nofl_err("%s: NULL shared mem struct passed",
|
||||||
__func__);
|
__func__);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -54,8 +54,8 @@
|
|||||||
do { \
|
do { \
|
||||||
if (!spin_is_locked(x)) { \
|
if (!spin_is_locked(x)) { \
|
||||||
WARN_ON(1); \
|
WARN_ON(1); \
|
||||||
printk(KERN_EMERG " %s:%d unlock addr=%pK, %s \n", __func__, __LINE__, x, \
|
qdf_info("unlock addr=%pK, %s", x, \
|
||||||
!spin_is_locked(x) ? "Not locked" : ""); \
|
!spin_is_locked(x) ? "Not locked" : ""); \
|
||||||
} \
|
} \
|
||||||
spin_unlock_bh(x); \
|
spin_unlock_bh(x); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
@@ -329,7 +329,6 @@ enum __qdf_net_wireless_evcode {
|
|||||||
__QDF_CUSTOM_PUSH_BUTTON = IWEVCUSTOM,
|
__QDF_CUSTOM_PUSH_BUTTON = IWEVCUSTOM,
|
||||||
};
|
};
|
||||||
|
|
||||||
#define __qdf_print printk
|
|
||||||
#define __qdf_vprint vprintk
|
#define __qdf_vprint vprintk
|
||||||
#define __qdf_snprint snprintf
|
#define __qdf_snprint snprintf
|
||||||
#define __qdf_vsnprint vsnprintf
|
#define __qdf_vsnprint vsnprintf
|
||||||
|
Reference in New Issue
Block a user