From e37321aa9028b7bf74feb45836aef00559b1ff1f Mon Sep 17 00:00:00 2001 From: Lincoln Tran Date: Mon, 8 Jun 2020 15:17:55 -0700 Subject: [PATCH] qcacmn: Revert wlan_serialization_generic_timer_cb Revert the change for wlan_serialization_generic_timer_cb from change I760b41b81c006187efb162d410390e1c11878b82. The change introduced a CFI error because timer callbacks do not expect a return status. Change-Id: Iebb17fb82c5b3d4b1393e2b3417c766d118c0674 CRs-fixed: 2687777 --- .../serialization/src/wlan_serialization_internal.c | 8 +++----- .../serialization/src/wlan_serialization_internal_i.h | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/umac/cmn_services/serialization/src/wlan_serialization_internal.c b/umac/cmn_services/serialization/src/wlan_serialization_internal.c index 88dfc7636147..4fc7562a3f05 100644 --- a/umac/cmn_services/serialization/src/wlan_serialization_internal.c +++ b/umac/cmn_services/serialization/src/wlan_serialization_internal.c @@ -538,7 +538,7 @@ error: return status; } -QDF_STATUS wlan_serialization_generic_timer_cb(void *arg) +void wlan_serialization_generic_timer_cb(void *arg) { struct wlan_serialization_timer *timer = arg; struct wlan_serialization_command *cmd = timer->cmd; @@ -548,13 +548,13 @@ QDF_STATUS wlan_serialization_generic_timer_cb(void *arg) if (!cmd) { ser_err("Command not found"); - return QDF_STATUS_E_FAILURE; + return; } vdev = cmd->vdev; if (!vdev) { ser_err("Invalid vdev"); - return QDF_STATUS_E_FAILURE; + return; } ser_err("Active cmd timeout for cmd_type[%d] vdev[%d]", @@ -572,8 +572,6 @@ QDF_STATUS wlan_serialization_generic_timer_cb(void *arg) /* Release the ref taken before the timer was started */ if (status == WLAN_SER_CMD_IN_ACTIVE_LIST) wlan_objmgr_vdev_release_ref(vdev, WLAN_SERIALIZATION_ID); - - return QDF_STATUS_SUCCESS; } static QDF_STATUS wlan_serialization_mc_flush_noop(struct scheduler_msg *msg) diff --git a/umac/cmn_services/serialization/src/wlan_serialization_internal_i.h b/umac/cmn_services/serialization/src/wlan_serialization_internal_i.h index a1cb902fad3b..6231bd4a0692 100644 --- a/umac/cmn_services/serialization/src/wlan_serialization_internal_i.h +++ b/umac/cmn_services/serialization/src/wlan_serialization_internal_i.h @@ -128,9 +128,9 @@ wlan_serialization_dequeue_cmd(struct wlan_serialization_command *cmd, * timed-out command from active queue and move any pending command to active * queue of same cmd_type. * - * Return: QDF_STATUS + * Return: none */ -QDF_STATUS wlan_serialization_generic_timer_cb(void *arg); +void wlan_serialization_generic_timer_cb(void *arg); /** * wlan_serialization_find_and_start_timer() - to find and start the timer