diff --git a/qdf/linux/src/qdf_lock.c b/qdf/linux/src/qdf_lock.c index 6a541d4163..f16d5d8092 100644 --- a/qdf/linux/src/qdf_lock.c +++ b/qdf/linux/src/qdf_lock.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -829,9 +829,6 @@ void qdf_lock_stats_cookie_create(struct lock_stats *stats, qdf_atomic_inc(&lock_cookie_get_failures); count = qdf_atomic_inc_return(&lock_cookie_untracked_num); stats->cookie = (void *) DUMMY_LOCK_COOKIE; - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_DEBUG, - "%s: cookie allocation failure, using dummy (%s:%d) count %d", - __func__, func, line, count); return; } diff --git a/qdf/linux/src/qdf_mc_timer.c b/qdf/linux/src/qdf_mc_timer.c index e5c2ed2a7b..b4c0453275 100644 --- a/qdf/linux/src/qdf_mc_timer.c +++ b/qdf/linux/src/qdf_mc_timer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -718,16 +718,16 @@ QDF_STATUS qdf_mc_timer_stop(qdf_mc_timer_t *timer) { /* check for invalid pointer */ if (!timer) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s Null timer pointer being passed", __func__); + QDF_TRACE_DEBUG_RL(QDF_MODULE_ID_QDF, + "%s Null timer pointer", __func__); QDF_ASSERT(0); return QDF_STATUS_E_INVAL; } /* check if timer refers to an uninitialized object */ if (LINUX_TIMER_COOKIE != timer->platform_info.cookie) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s: Cannot stop uninitialized timer", __func__); + QDF_TRACE_DEBUG_RL(QDF_MODULE_ID_QDF, + "%s: Cannot stop uninit timer", __func__); QDF_ASSERT(0); return QDF_STATUS_E_INVAL; @@ -738,9 +738,6 @@ QDF_STATUS qdf_mc_timer_stop(qdf_mc_timer_t *timer) if (QDF_TIMER_STATE_RUNNING != timer->state) { qdf_spin_unlock_irqrestore(&timer->platform_info.spinlock); - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, - "%s: Cannot stop timer in state = %d", - __func__, timer->state); return QDF_STATUS_SUCCESS; } @@ -760,16 +757,16 @@ QDF_STATUS qdf_mc_timer_stop_sync(qdf_mc_timer_t *timer) { /* check for invalid pointer */ if (!timer) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s Null timer pointer being passed", __func__); + QDF_TRACE_DEBUG_RL(QDF_MODULE_ID_QDF, + "%s Null timer pointer", __func__); QDF_ASSERT(0); return QDF_STATUS_E_INVAL; } /* check if timer refers to an uninitialized object */ if (LINUX_TIMER_COOKIE != timer->platform_info.cookie) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s: Cannot stop uninitialized timer", __func__); + QDF_TRACE_DEBUG_RL(QDF_MODULE_ID_QDF, + "%s: Cannot stop uninit timer", __func__); QDF_ASSERT(0); return QDF_STATUS_E_INVAL; @@ -780,9 +777,6 @@ QDF_STATUS qdf_mc_timer_stop_sync(qdf_mc_timer_t *timer) if (QDF_TIMER_STATE_RUNNING != timer->state) { qdf_spin_unlock_irqrestore(&timer->platform_info.spinlock); - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, - "%s: Cannot stop timer in state = %d", - __func__, timer->state); return QDF_STATUS_SUCCESS; } diff --git a/utils/logging/src/wlan_logging_sock_svc.c b/utils/logging/src/wlan_logging_sock_svc.c index b9a6293645..fa94511c3d 100644 --- a/utils/logging/src/wlan_logging_sock_svc.c +++ b/utils/logging/src/wlan_logging_sock_svc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -287,7 +287,7 @@ static int wlan_add_user_log_time_stamp(char *tbuf, size_t tbuf_sz, uint64_t ts) qdf_get_time_of_the_day_in_hr_min_sec_usec(time_buf, sizeof(time_buf)); - return scnprintf(tbuf, tbuf_sz, "[%.16s][0x%llx]%s", + return scnprintf(tbuf, tbuf_sz, "[%.6s][0x%llx]%s", current_process_name(), ts, time_buf); }