samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
派生 0
代码 工单 合并请求 工作流 软件包 项目 发布 百科 活动

qcacmn: Cleanup qdf_event logs

浏览代码 
qdf_event has a number of overly verbose logs, which use QDF_TRACE
directly. As direct use of QDF_TRACE is deprecated, optimize logs in
qdf_event and replace any remaining QDF_TRACE calls with qdf_*()
logging macros.

Change-Id: I89491d7e49ea323d1bc3a32789c005b0238f0099
CRs-Fixed: 2270770
这个提交包含在：
Dustin Brown
2018-06-29 11:58:24 -07:00
提交者 nshrivas
父节点 9a59bd6483
当前提交 a275f21008
共修改 1 个文件，包含 60 行新增和 120 行删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

180
qdf/linux/src/qdf_event.c
查看文件

@@ -59,21 +59,14 @@ static qdf_spinlock_t qdf_wait_event_lock;
*/
QDF_STATUS qdf_event_create(qdf_event_t *event)
{
/* check for null pointer */
if (NULL == event) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"NULL event passed into %s", __func__);
QDF_ASSERT(0);
QDF_BUG(event);
if (!event)
return QDF_STATUS_E_FAULT;
}
/* check for 'already initialized' event */
if (LINUX_EVENT_COOKIE == event->cookie) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"Initialized event passed into %s", __func__);
QDF_ASSERT(0);
QDF_BUG(event->cookie != LINUX_EVENT_COOKIE);
if (event->cookie == LINUX_EVENT_COOKIE)
return QDF_STATUS_E_BUSY;
}
/* initialize new event */
init_completion(&event->complete);
@@ -98,21 +91,14 @@ qdf_export_symbol(qdf_event_create);
*/
QDF_STATUS qdf_event_set(qdf_event_t *event)
{
/* check for null pointer */
if (NULL == event) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"NULL event passed into %s", __func__);
QDF_ASSERT(0);
QDF_BUG(event);
if (!event)
return QDF_STATUS_E_FAULT;
}
/* check if event refers to an initialized object */
if (LINUX_EVENT_COOKIE != event->cookie) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"Uninitialized event passed into %s", __func__);
QDF_ASSERT(0);
/* ensure event is initialized */
QDF_BUG(event->cookie == LINUX_EVENT_COOKIE);
if (event->cookie != LINUX_EVENT_COOKIE)
return QDF_STATUS_E_INVAL;
}
complete(&event->complete);
@@ -137,25 +123,19 @@ qdf_export_symbol(qdf_event_set);
*/
QDF_STATUS qdf_event_reset(qdf_event_t *event)
{
/* check for null pointer */
if (NULL == event) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"NULL event passed into %s", __func__);
QDF_ASSERT(0);
QDF_BUG(event);
if (!event)
return QDF_STATUS_E_FAULT;
}
/* check to make sure it is an 'already initialized' event */
if (LINUX_EVENT_COOKIE != event->cookie) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"Uninitialized event passed into %s", __func__);
QDF_ASSERT(0);
/* ensure event is initialized */
QDF_BUG(event->cookie == LINUX_EVENT_COOKIE);
if (event->cookie != LINUX_EVENT_COOKIE)
return QDF_STATUS_E_INVAL;
}
event->force_set = false;
/* (re)initialize event */
event->force_set = false;
INIT_COMPLETION(event->complete);
return QDF_STATUS_SUCCESS;
}
qdf_export_symbol(qdf_event_reset);
@@ -182,21 +162,14 @@ qdf_export_symbol(qdf_event_reset);
*/
QDF_STATUS qdf_event_destroy(qdf_event_t *event)
{
/* check for null pointer */
if (NULL == event) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"NULL event passed into %s", __func__);
QDF_ASSERT(0);
QDF_BUG(event);
if (!event)
return QDF_STATUS_E_FAULT;
}
/* check to make sure it is an 'already initialized' event */
if (LINUX_EVENT_COOKIE != event->cookie) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"Uninitialized event passed into %s", __func__);
QDF_ASSERT(0);
/* ensure event is initialized */
QDF_BUG(event->cookie == LINUX_EVENT_COOKIE);
if (event->cookie != LINUX_EVENT_COOKIE)
return QDF_STATUS_E_INVAL;
}
/* make sure nobody is waiting on the event */
complete_all(&event->complete);
@@ -222,45 +195,33 @@ qdf_export_symbol(qdf_event_destroy);
*/
QDF_STATUS qdf_wait_single_event(qdf_event_t *event, uint32_t timeout)
{
if (in_interrupt()) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"%s cannot be called from interrupt context!!!",
__func__);
QDF_ASSERT(0);
QDF_BUG(!in_interrupt());
if (in_interrupt())
return QDF_STATUS_E_FAULT;
}
/* check for null pointer */
if (NULL == event) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"NULL event passed into %s", __func__);
QDF_ASSERT(0);
QDF_BUG(event);
if (!event)
return QDF_STATUS_E_FAULT;
}
/* check if cookie is same as that of initialized event */
if (LINUX_EVENT_COOKIE != event->cookie) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"Uninitialized event passed into %s", __func__);
QDF_ASSERT(0);
/* ensure event is initialized */
QDF_BUG(event->cookie == LINUX_EVENT_COOKIE);
if (event->cookie != LINUX_EVENT_COOKIE)
return QDF_STATUS_E_INVAL;
}
/* update the timeout if its on a emaulation platform */
timeout *= qdf_timer_get_multiplier();
if (timeout) {
long ret;
/* update the timeout if it's on an emulation platform */
timeout *= qdf_timer_get_multiplier();
ret = wait_for_completion_timeout(&event->complete,
msecs_to_jiffies(timeout));
if (0 >= ret)
if (ret <= 0)
return QDF_STATUS_E_TIMEOUT;
} else {
wait_for_completion(&event->complete);
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
"Signaled for completion %s", __func__);
return QDF_STATUS_SUCCESS;
}
return QDF_STATUS_SUCCESS;
}
qdf_export_symbol(qdf_wait_single_event);
@@ -323,85 +284,64 @@ QDF_STATUS qdf_wait_for_event_completion(qdf_event_t *event, uint32_t timeout)
struct qdf_evt_node *event_node;
QDF_STATUS status;
if (in_interrupt()) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"%s cannot be called from interrupt context!!!",
__func__);
QDF_ASSERT(0);
QDF_BUG(!in_interrupt());
if (in_interrupt())
return QDF_STATUS_E_FAULT;
}
/* check for null pointer */
if (NULL == event) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"NULL event passed into %s", __func__);
QDF_ASSERT(0);
QDF_BUG(event);
if (!event)
return QDF_STATUS_E_FAULT;
}
/* check if cookie is same as that of initialized event */
if (LINUX_EVENT_COOKIE != event->cookie) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"Uninitialized event passed into %s", __func__);
QDF_ASSERT(0);
/* ensure event is initialized */
QDF_BUG(event->cookie == LINUX_EVENT_COOKIE);
if (event->cookie != LINUX_EVENT_COOKIE)
return QDF_STATUS_E_INVAL;
}
event_node = qdf_mem_malloc(sizeof(*event_node));
if (NULL == event_node) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"Could not allocate for event node in %s", __func__);
QDF_ASSERT(0);
if (!event_node) {
qdf_err("Out of memory");
return QDF_STATUS_E_NOMEM;
}
event_node->pevent = event;
qdf_spin_lock(&qdf_wait_event_lock);
status = qdf_list_insert_back(&qdf_wait_event_list,
&event_node->node);
status = qdf_list_insert_back(&qdf_wait_event_list, &event_node->node);
qdf_spin_unlock(&qdf_wait_event_lock);
if (QDF_STATUS_SUCCESS != status) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"Failed to add event in the list in %s", __func__),
status = QDF_STATUS_E_FAULT;
goto err_list_add;
qdf_err("Failed to insert event into tracking list");
goto free_node;
}
/* update the timeout if its on a emaulation platform */
timeout *= qdf_timer_get_multiplier();
if (timeout) {
long ret;
/* update the timeout if it's on an emulation platform */
timeout *= qdf_timer_get_multiplier();
ret = wait_for_completion_timeout(&event->complete,
msecs_to_jiffies(timeout));
if (0 >= ret)
/* Timeout occurred */
if (ret <= 0) {
status = QDF_STATUS_E_TIMEOUT;
else {
if (event->force_set)
/* Event forcefully completed, return fail */
status = QDF_STATUS_E_FAULT;
else
status = QDF_STATUS_SUCCESS;
goto list_remove;
}
} else {
wait_for_completion(&event->complete);
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
"Signaled for completion %s", __func__);
if (event->force_set)
/* Event forcefully completed, return fail */
status = QDF_STATUS_E_FAULT;
else
status = QDF_STATUS_SUCCESS;
}
/* if event was forcefully completed, return failure */
if (event->force_set)
status = QDF_STATUS_E_FAULT;
list_remove:
qdf_spin_lock(&qdf_wait_event_lock);
qdf_list_remove_node(&qdf_wait_event_list,
&event_node->node);
qdf_list_remove_node(&qdf_wait_event_list, &event_node->node);
qdf_spin_unlock(&qdf_wait_event_lock);
err_list_add:
free_node:
qdf_mem_free(event_node);
return status;
}
qdf_export_symbol(qdf_wait_for_event_completion);