qcacld-3.0: Change return type to QDF_STATUS

Change return type of following APIs from int to QDF_STATUS.
wmi_unified_register_event()
wmi_unified_register_event_handler()
wmi_unified_register_raw_event_handler()
wmi_unified_unregister_event()
wmi_unified_unregister_event_handler()

Change-Id: I534b499edbcfec6eddea0e9ed48f9eb1a2e872c8
CRs-Fixed: 2791275
这个提交包含在:
Gururaj Pandurangi
2020-08-26 16:37:40 -07:00
提交者 snandini
父节点 6294d90130
当前提交 02b2ffc7d1
修改 10 个文件,包含 111 行新增98 行删除

查看文件

@@ -269,7 +269,7 @@ target_if_twt_session_params_unregister_evt_hdlr(struct wlan_objmgr_psoc *psoc)
static QDF_STATUS
target_if_twt_session_params_register_evt_hdlr(struct wlan_objmgr_psoc *psoc)
{
int ret_val;
QDF_STATUS ret_val;
struct wmi_unified *wmi_handle;
if (!psoc) {
@@ -289,10 +289,10 @@ target_if_twt_session_params_register_evt_hdlr(struct wlan_objmgr_psoc *psoc)
target_if_twt_session_params_event_handler,
WMI_RX_WORK_CTX);
if (ret_val)
if (QDF_IS_STATUS_ERROR(ret_val))
target_if_err("Failed to register twt session stats event cb");
return qdf_status_from_os_return(ret_val);
return ret_val;
}
#else
static QDF_STATUS
@@ -1076,7 +1076,7 @@ static void target_if_cp_stats_inc_wake_lock_stats(uint32_t reason,
static QDF_STATUS
target_if_cp_stats_register_event_handler(struct wlan_objmgr_psoc *psoc)
{
int ret_val;
QDF_STATUS ret_val;
struct wmi_unified *wmi_handle;
if (!psoc) {
@@ -1095,17 +1095,17 @@ target_if_cp_stats_register_event_handler(struct wlan_objmgr_psoc *psoc)
wmi_update_stats_event_id,
target_if_mc_cp_stats_stats_event_handler,
WMI_RX_WORK_CTX);
if (ret_val)
if (QDF_IS_STATUS_ERROR(ret_val))
cp_stats_err("Failed to register stats event cb");
ret_val = wmi_unified_register_event_handler(wmi_handle,
wmi_peer_stats_info_event_id,
target_if_mc_cp_stats_peer_stats_info_event_handler,
WMI_RX_WORK_CTX);
if (ret_val)
if (QDF_IS_STATUS_ERROR(ret_val))
cp_stats_err("Failed to register peer stats info event cb");
return qdf_status_from_os_return(ret_val);
return ret_val;
}
static QDF_STATUS

查看文件

@@ -78,7 +78,7 @@ target_if_disa_register_ev_handlers(struct wlan_objmgr_psoc *psoc)
status = wmi_unified_register_event(wmi_handle,
wmi_vdev_encrypt_decrypt_data_rsp_event_id,
target_if_encrypt_decrypt_event_handler);
if (status) {
if (QDF_IS_STATUS_ERROR(status)) {
target_if_err("Failed to register Scan match event cb");
return QDF_STATUS_E_FAILURE;
}

查看文件

@@ -168,7 +168,7 @@ target_if_ftm_time_sync_master_slave_offset(struct wlan_objmgr_psoc *psoc)
wmi_wlan_time_sync_q_master_slave_offset_eventid,
target_if_time_sync_master_slave_offset_event_handler,
WMI_RX_SERIALIZER_CTX);
if (status) {
if (QDF_IS_STATUS_ERROR(status)) {
target_if_err("Ftm time_sync offset event register failed");
return QDF_STATUS_E_FAILURE;
}
@@ -180,7 +180,7 @@ QDF_STATUS
target_if_ftm_time_sync_unregister_ev_handlers(struct wlan_objmgr_psoc *psoc)
{
wmi_unified_t wmi_handle;
int ret, status = 0;
QDF_STATUS ret, status = QDF_STATUS_SUCCESS;
wmi_handle = get_wmi_unified_hdl_from_psoc(psoc);
if (!wmi_handle) {
@@ -191,7 +191,7 @@ target_if_ftm_time_sync_unregister_ev_handlers(struct wlan_objmgr_psoc *psoc)
ret = wmi_unified_unregister_event(
wmi_handle,
wmi_wlan_time_sync_ftm_start_stop_event_id);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("failed to unregister time sync start/stop evt");
status = ret;
}
@@ -199,12 +199,12 @@ target_if_ftm_time_sync_unregister_ev_handlers(struct wlan_objmgr_psoc *psoc)
ret = wmi_unified_unregister_event(
wmi_handle,
wmi_wlan_time_sync_q_master_slave_offset_eventid);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("failed to unregister time sync offset evt");
status = ret;
}
if (status)
if (QDF_IS_STATUS_ERROR(status))
return QDF_STATUS_E_FAILURE;
else
return QDF_STATUS_SUCCESS;

查看文件

@@ -154,12 +154,12 @@ static void
target_if_fwol_register_elna_event_handler(struct wlan_objmgr_psoc *psoc,
void *arg)
{
int rc;
QDF_STATUS rc;
rc = wmi_unified_register_event(get_wmi_unified_hdl_from_psoc(psoc),
wmi_get_elna_bypass_event_id,
target_if_fwol_get_elna_bypass_resp);
if (rc)
if (QDF_IS_STATUS_ERROR(rc))
target_if_debug("Failed to register get eLNA bypass event cb");
}
@@ -167,12 +167,12 @@ static void
target_if_fwol_unregister_elna_event_handler(struct wlan_objmgr_psoc *psoc,
void *arg)
{
int rc;
QDF_STATUS rc;
rc = wmi_unified_unregister_event_handler(
get_wmi_unified_hdl_from_psoc(psoc),
wmi_get_elna_bypass_event_id);
if (rc)
if (QDF_IS_STATUS_ERROR(rc))
target_if_debug("Failed to unregister get eLNA bypass event cb");
}

查看文件

@@ -84,7 +84,7 @@ QDF_STATUS
target_if_interop_issues_ap_register_event_handler(
struct wlan_objmgr_psoc *psoc)
{
int ret_val;
QDF_STATUS ret_val;
struct wmi_unified *wmi_handle;
if (!psoc) {
@@ -102,10 +102,10 @@ target_if_interop_issues_ap_register_event_handler(
wmi_pdev_interop_issues_ap_event_id,
target_if_interop_issues_ap_event_handler,
WMI_RX_WORK_CTX);
if (ret_val)
if (QDF_IS_STATUS_ERROR(ret_val))
target_if_err("Failed to register event cb");
return qdf_status_from_os_return(ret_val);
return ret_val;
}
/**

查看文件

@@ -966,7 +966,7 @@ int target_if_nan_rsp_handler(ol_scn_t scn, uint8_t *data, uint32_t len)
QDF_STATUS target_if_nan_register_events(struct wlan_objmgr_psoc *psoc)
{
int ret;
QDF_STATUS ret;
wmi_unified_t handle = get_wmi_unified_hdl_from_psoc(psoc);
if (!handle) {
@@ -978,7 +978,7 @@ QDF_STATUS target_if_nan_register_events(struct wlan_objmgr_psoc *psoc)
ret = wmi_unified_register_event_handler(handle, wmi_nan_event_id,
target_if_nan_rsp_handler,
WMI_RX_UMAC_CTX);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event registration failed, ret: %d", ret);
return QDF_STATUS_E_FAILURE;
}
@@ -987,7 +987,7 @@ QDF_STATUS target_if_nan_register_events(struct wlan_objmgr_psoc *psoc)
wmi_ndp_initiator_rsp_event_id,
target_if_ndp_initiator_rsp_handler,
WMI_RX_UMAC_CTX);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event registration failed, ret: %d", ret);
return QDF_STATUS_E_FAILURE;
}
@@ -995,7 +995,7 @@ QDF_STATUS target_if_nan_register_events(struct wlan_objmgr_psoc *psoc)
ret = wmi_unified_register_event_handler(handle, wmi_nan_dmesg_event_id,
target_if_nan_dmesg_handler,
WMI_RX_UMAC_CTX);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event registration failed, ret: %d", ret);
target_if_nan_deregister_events(psoc);
return QDF_STATUS_E_FAILURE;
@@ -1005,7 +1005,7 @@ QDF_STATUS target_if_nan_register_events(struct wlan_objmgr_psoc *psoc)
wmi_ndp_indication_event_id,
target_if_ndp_ind_handler,
WMI_RX_UMAC_CTX);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event registration failed, ret: %d", ret);
target_if_nan_deregister_events(psoc);
return QDF_STATUS_E_FAILURE;
@@ -1015,7 +1015,7 @@ QDF_STATUS target_if_nan_register_events(struct wlan_objmgr_psoc *psoc)
wmi_ndp_confirm_event_id,
target_if_ndp_confirm_handler,
WMI_RX_UMAC_CTX);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event registration failed, ret: %d", ret);
target_if_nan_deregister_events(psoc);
return QDF_STATUS_E_FAILURE;
@@ -1025,7 +1025,7 @@ QDF_STATUS target_if_nan_register_events(struct wlan_objmgr_psoc *psoc)
wmi_ndp_responder_rsp_event_id,
target_if_ndp_responder_rsp_handler,
WMI_RX_UMAC_CTX);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event registration failed, ret: %d", ret);
target_if_nan_deregister_events(psoc);
return QDF_STATUS_E_FAILURE;
@@ -1035,7 +1035,7 @@ QDF_STATUS target_if_nan_register_events(struct wlan_objmgr_psoc *psoc)
wmi_ndp_end_indication_event_id,
target_if_ndp_end_ind_handler,
WMI_RX_UMAC_CTX);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event registration failed, ret: %d", ret);
target_if_nan_deregister_events(psoc);
return QDF_STATUS_E_FAILURE;
@@ -1045,7 +1045,7 @@ QDF_STATUS target_if_nan_register_events(struct wlan_objmgr_psoc *psoc)
wmi_ndp_end_rsp_event_id,
target_if_ndp_end_rsp_handler,
WMI_RX_UMAC_CTX);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event registration failed, ret: %d", ret);
target_if_nan_deregister_events(psoc);
return QDF_STATUS_E_FAILURE;
@@ -1055,7 +1055,7 @@ QDF_STATUS target_if_nan_register_events(struct wlan_objmgr_psoc *psoc)
wmi_ndl_schedule_update_event_id,
target_if_ndp_sch_update_handler,
WMI_RX_UMAC_CTX);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event registration failed, ret: %d", ret);
target_if_nan_deregister_events(psoc);
return QDF_STATUS_E_FAILURE;
@@ -1064,7 +1064,7 @@ QDF_STATUS target_if_nan_register_events(struct wlan_objmgr_psoc *psoc)
ret = wmi_unified_register_event_handler(handle, wmi_ndp_event_id,
target_if_ndp_host_event_handler,
WMI_RX_UMAC_CTX);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event registration failed, ret: %d", ret);
target_if_nan_deregister_events(psoc);
return QDF_STATUS_E_FAILURE;
@@ -1075,7 +1075,7 @@ QDF_STATUS target_if_nan_register_events(struct wlan_objmgr_psoc *psoc)
QDF_STATUS target_if_nan_deregister_events(struct wlan_objmgr_psoc *psoc)
{
int ret, status = 0;
QDF_STATUS ret, status = QDF_STATUS_SUCCESS;
wmi_unified_t handle = get_wmi_unified_hdl_from_psoc(psoc);
if (!handle) {
@@ -1084,67 +1084,67 @@ QDF_STATUS target_if_nan_deregister_events(struct wlan_objmgr_psoc *psoc)
}
ret = wmi_unified_unregister_event_handler(handle,
wmi_ndl_schedule_update_event_id);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event deregistration failed, ret: %d", ret);
status = ret;
}
ret = wmi_unified_unregister_event_handler(handle,
wmi_ndp_end_rsp_event_id);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event deregistration failed, ret: %d", ret);
status = ret;
}
ret = wmi_unified_unregister_event_handler(handle,
wmi_ndp_end_indication_event_id);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event deregistration failed, ret: %d", ret);
status = ret;
}
ret = wmi_unified_unregister_event_handler(handle,
wmi_ndp_responder_rsp_event_id);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event deregistration failed, ret: %d", ret);
status = ret;
}
ret = wmi_unified_unregister_event_handler(handle,
wmi_ndp_confirm_event_id);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event deregistration failed, ret: %d", ret);
status = ret;
}
ret = wmi_unified_unregister_event_handler(handle,
wmi_ndp_indication_event_id);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event deregistration failed, ret: %d", ret);
status = ret;
}
ret = wmi_unified_unregister_event_handler(handle,
wmi_nan_dmesg_event_id);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event deregistration failed, ret: %d", ret);
status = ret;
}
ret = wmi_unified_unregister_event_handler(handle,
wmi_ndp_initiator_rsp_event_id);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event deregistration failed, ret: %d", ret);
status = ret;
}
ret = wmi_unified_unregister_event_handler(handle, wmi_ndp_event_id);
if (ret) {
if (QDF_IS_STATUS_ERROR(ret)) {
target_if_err("wmi event deregistration failed, ret: %d", ret);
status = ret;
}
if (status)
if (QDF_IS_STATUS_ERROR(status))
return QDF_STATUS_E_FAILURE;
else
return QDF_STATUS_SUCCESS;

查看文件

@@ -574,13 +574,13 @@ exit:
QDF_STATUS target_if_ocb_register_event_handler(struct wlan_objmgr_psoc *psoc,
void *arg)
{
int rc;
QDF_STATUS rc;
/* Initialize the members in WMA used by wma_ocb */
rc = wmi_unified_register_event(get_wmi_unified_hdl_from_psoc(psoc),
wmi_ocb_set_config_resp_event_id,
target_if_ocb_set_config_resp);
if (rc) {
if (QDF_IS_STATUS_ERROR(rc)) {
target_if_err("Failed to register OCB config resp event cb");
return QDF_STATUS_E_FAILURE;
}
@@ -589,7 +589,7 @@ QDF_STATUS target_if_ocb_register_event_handler(struct wlan_objmgr_psoc *psoc,
get_wmi_unified_hdl_from_psoc(psoc),
wmi_ocb_get_tsf_timer_resp_event_id,
target_if_ocb_get_tsf_timer_resp);
if (rc) {
if (QDF_IS_STATUS_ERROR(rc)) {
target_if_err("Failed to register OCB TSF resp event cb");
goto unreg_set_config;
}
@@ -598,7 +598,7 @@ QDF_STATUS target_if_ocb_register_event_handler(struct wlan_objmgr_psoc *psoc,
get_wmi_unified_hdl_from_psoc(psoc),
wmi_dcc_get_stats_resp_event_id,
target_if_dcc_get_stats_resp);
if (rc) {
if (QDF_IS_STATUS_ERROR(rc)) {
target_if_err("Failed to register DCC get stats resp event cb");
goto unreg_tsf_timer;
}
@@ -607,7 +607,7 @@ QDF_STATUS target_if_ocb_register_event_handler(struct wlan_objmgr_psoc *psoc,
get_wmi_unified_hdl_from_psoc(psoc),
wmi_dcc_update_ndl_resp_event_id,
target_if_dcc_update_ndl_resp);
if (rc) {
if (QDF_IS_STATUS_ERROR(rc)) {
target_if_err("Failed to register NDL update event cb");
goto unreg_get_stats;
}
@@ -615,7 +615,7 @@ QDF_STATUS target_if_ocb_register_event_handler(struct wlan_objmgr_psoc *psoc,
rc = wmi_unified_register_event(get_wmi_unified_hdl_from_psoc(psoc),
wmi_dcc_stats_event_id,
target_if_dcc_stats_resp);
if (rc) {
if (QDF_IS_STATUS_ERROR(rc)) {
target_if_err("Failed to register DCC stats event cb");
goto unreg_ndl;
}
@@ -645,35 +645,40 @@ QDF_STATUS
target_if_ocb_unregister_event_handler(struct wlan_objmgr_psoc *psoc,
void *arg)
{
int rc;
QDF_STATUS rc;
rc = wmi_unified_unregister_event_handler(
get_wmi_unified_hdl_from_psoc(psoc),
wmi_dcc_stats_event_id);
if (rc)
if (QDF_IS_STATUS_ERROR(rc))
target_if_err("Failed to unregister DCC stats event cb");
rc = wmi_unified_unregister_event_handler(
get_wmi_unified_hdl_from_psoc(psoc),
wmi_dcc_update_ndl_resp_event_id);
if (rc)
if (QDF_IS_STATUS_ERROR(rc))
target_if_err("Failed to unregister NDL update event cb");
rc = wmi_unified_unregister_event_handler(
get_wmi_unified_hdl_from_psoc(psoc),
wmi_dcc_get_stats_resp_event_id);
if (rc)
if (QDF_IS_STATUS_ERROR(rc))
target_if_err("Failed to unregister DCC get stats resp cb");
rc = wmi_unified_unregister_event_handler(
get_wmi_unified_hdl_from_psoc(psoc),
wmi_ocb_get_tsf_timer_resp_event_id);
if (rc)
if (QDF_IS_STATUS_ERROR(rc))
target_if_err("Failed to unregister OCB TSF resp event cb");
rc = wmi_unified_unregister_event(get_wmi_unified_hdl_from_psoc(psoc),
wmi_ocb_set_config_resp_event_id);
if (rc)
if (QDF_IS_STATUS_ERROR(rc))
target_if_err("Failed to unregister OCB config resp event cb");
return QDF_STATUS_SUCCESS;

查看文件

@@ -111,7 +111,7 @@ static int target_p2p_lo_event_handler(ol_scn_t scn, uint8_t *data,
QDF_STATUS target_if_p2p_register_lo_event_handler(
struct wlan_objmgr_psoc *psoc, void *arg)
{
int status;
QDF_STATUS status;
wmi_unified_t wmi_handle = lmac_get_wmi_unified_hdl(psoc);
target_if_debug("psoc:%pK, arg:%pK", psoc, arg);
@@ -127,13 +127,16 @@ QDF_STATUS target_if_p2p_register_lo_event_handler(
target_if_debug("wmi register lo event handle, status:%d", status);
return status == 0 ? QDF_STATUS_SUCCESS : QDF_STATUS_E_FAILURE;
if (QDF_IS_STATUS_ERROR(status))
return QDF_STATUS_E_FAILURE;
else
return QDF_STATUS_SUCCESS;
}
QDF_STATUS target_if_p2p_unregister_lo_event_handler(
struct wlan_objmgr_psoc *psoc, void *arg)
{
int status;
QDF_STATUS status;
wmi_unified_t wmi_handle = lmac_get_wmi_unified_hdl(psoc);
target_if_debug("psoc:%pK, arg:%pK", psoc, arg);
@@ -148,7 +151,10 @@ QDF_STATUS target_if_p2p_unregister_lo_event_handler(
target_if_debug("wmi unregister lo event handle, status:%d", status);
return status == 0 ? QDF_STATUS_SUCCESS : QDF_STATUS_E_FAILURE;
if (QDF_IS_STATUS_ERROR(status))
return QDF_STATUS_E_FAILURE;
else
return QDF_STATUS_SUCCESS;
}
QDF_STATUS target_if_p2p_lo_start(struct wlan_objmgr_psoc *psoc,
@@ -282,7 +288,7 @@ QDF_STATUS target_if_p2p_register_noa_event_handler(
QDF_STATUS target_if_p2p_unregister_noa_event_handler(
struct wlan_objmgr_psoc *psoc, void *arg)
{
int status;
QDF_STATUS status;
wmi_unified_t wmi_handle = lmac_get_wmi_unified_hdl(psoc);
target_if_debug("psoc:%pK, arg:%pK", psoc, arg);
@@ -298,7 +304,10 @@ QDF_STATUS target_if_p2p_unregister_noa_event_handler(
target_if_debug("wmi unregister noa event handle, status:%d",
status);
return status == 0 ? QDF_STATUS_SUCCESS : QDF_STATUS_E_FAILURE;
if (QDF_IS_STATUS_ERROR(status))
return QDF_STATUS_E_FAILURE;
else
return QDF_STATUS_SUCCESS;
}
QDF_STATUS target_if_p2p_set_ps(struct wlan_objmgr_psoc *psoc,

查看文件

@@ -178,14 +178,14 @@ target_if_register_mgmt_data_offload_event(struct wlan_objmgr_psoc *psoc)
if (ucfg_pkt_capture_get_mode(psoc) &&
wmi_service_enabled(wmi_handle,
wmi_service_packet_capture_support)) {
uint8_t status;
QDF_STATUS status;
status = wmi_unified_register_event_handler(
wmi_handle,
wmi_mgmt_offload_data_event_id,
target_if_mgmt_offload_data_event_handler,
WMI_RX_WORK_CTX);
if (status) {
if (QDF_IS_STATUS_ERROR(status)) {
pkt_capture_err("Failed to register MGMT offload handler");
return QDF_STATUS_E_FAILURE;
}