From a9d5d1ee002e13ba0c71590dd70d2a74b50db07e Mon Sep 17 00:00:00 2001 From: aloksing Date: Thu, 20 Aug 2020 00:19:56 +0530 Subject: [PATCH] qcacmn: Change return type to QDF_STATUS wmi_unified_register_event return QDF_STATUS CRs-Fixed: 2764185 Change-Id: I266e5042ff45ba33ab5d53592515bceb4fec92ac --- wmi/inc/wmi_unified_api.h | 40 +++++++++++++++++------------------ wmi/src/wmi_unified.c | 44 ++++++++++++++------------------------- 2 files changed, 36 insertions(+), 48 deletions(-) diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h index eaa93d6366..36964789c8 100644 --- a/wmi/inc/wmi_unified_api.h +++ b/wmi/inc/wmi_unified_api.h @@ -375,14 +375,13 @@ QDF_STATUS wmi_unified_cmd_send_pm_chk(struct wmi_unified *wmi_handle, /** * wmi_unified_register_event() - WMI event handler * registration function for converged components - * * @wmi_handle: handle to WMI. * @event_id: WMI event ID * @handler_func: Event handler call back function * - * @return 0 on success and -ve on failure. + * Return: QDF_STATUS */ -int +QDF_STATUS wmi_unified_register_event(wmi_unified_t wmi_handle, uint32_t event_id, wmi_unified_event_handler handler_func); @@ -390,30 +389,30 @@ wmi_unified_register_event(wmi_unified_t wmi_handle, /** * wmi_unified_register_event_handler() - WMI event handler * registration function - * * @wmi_handle: handle to WMI. * @event_id: WMI event ID * @handler_func: Event handler call back function * @rx_ctx: rx event processing context * - * @return 0 on success and -ve on failure. + * Return: QDF_STATUS */ -int +QDF_STATUS wmi_unified_register_event_handler(wmi_unified_t wmi_handle, wmi_conv_event_id event_id, wmi_unified_event_handler handler_func, uint8_t rx_ctx); /** - * WMI event handler unregister function for converged componets + * wmi_unified_unregister_event() - WMI event handler unregister function + * for converged componets + * @wmi_handle: handle to WMI. + * @event_id: WMI event ID * - * @param wmi_handle : handle to WMI. - * @param event_id : WMI event ID - * @return 0 on success and -ve on failure. + * Return: QDF_STATUS */ -int +QDF_STATUS wmi_unified_unregister_event(wmi_unified_t wmi_handle, - uint32_t event_id); + uint32_t event_id); /** * wmi_unified_register_raw_event_handler() - WMI event handler @@ -425,24 +424,25 @@ wmi_unified_unregister_event(wmi_unified_t wmi_handle, * * Register event handler to get struct wmi_raw_event_buffer as arg * - * @return: 0 on success and -ve on failure. + * Return: QDF_STATUS */ -int +QDF_STATUS wmi_unified_register_raw_event_handler(wmi_unified_t wmi_handle, wmi_conv_event_id event_id, wmi_unified_event_handler handler_func, enum wmi_rx_exec_ctx rx_ctx); /** - * WMI event handler unregister function + * wmi_unified_unregister_event_handler() - WMI event handler unregister + * function + * wmi_handle: handle to WMI. + * event_id: WMI event ID * - * @param wmi_handle : handle to WMI. - * @param event_id : WMI event ID - * @return 0 on success and -ve on failure. + * Return: QDF_STATUS */ -int +QDF_STATUS wmi_unified_unregister_event_handler(wmi_unified_t wmi_handle, - wmi_conv_event_id event_id); + wmi_conv_event_id event_id); /** * wmi_unified_connect_htc_service() - WMI API to get connect to HTC service diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c index d1dc3326b7..b4b11051b5 100644 --- a/wmi/src/wmi_unified.c +++ b/wmi/src/wmi_unified.c @@ -2033,9 +2033,10 @@ wmi_register_event_handler_with_ctx(wmi_unified_t wmi_handle, return QDF_STATUS_SUCCESS; } -int wmi_unified_register_event(wmi_unified_t wmi_handle, - uint32_t event_id, - wmi_unified_event_handler handler_func) +QDF_STATUS +wmi_unified_register_event(wmi_unified_t wmi_handle, + uint32_t event_id, + wmi_unified_event_handler handler_func) { return wmi_register_event_handler_with_ctx(wmi_handle, event_id, handler_func, @@ -2043,10 +2044,11 @@ int wmi_unified_register_event(wmi_unified_t wmi_handle, WMI_RX_PROCESSED_BUFF); } -int wmi_unified_register_event_handler(wmi_unified_t wmi_handle, - wmi_conv_event_id event_id, - wmi_unified_event_handler handler_func, - uint8_t rx_ctx) +QDF_STATUS +wmi_unified_register_event_handler(wmi_unified_t wmi_handle, + wmi_conv_event_id event_id, + wmi_unified_event_handler handler_func, + uint8_t rx_ctx) { return wmi_register_event_handler_with_ctx(wmi_handle, event_id, handler_func, rx_ctx, @@ -2055,7 +2057,7 @@ int wmi_unified_register_event_handler(wmi_unified_t wmi_handle, qdf_export_symbol(wmi_unified_register_event_handler); -int +QDF_STATUS wmi_unified_register_raw_event_handler(wmi_unified_t wmi_handle, wmi_conv_event_id event_id, wmi_unified_event_handler handler_func, @@ -2068,15 +2070,8 @@ wmi_unified_register_raw_event_handler(wmi_unified_t wmi_handle, qdf_export_symbol(wmi_unified_register_raw_event_handler); -/** - * wmi_unified_unregister_event() - unregister wmi event handler - * @wmi_handle: handle to wmi - * @event_id: wmi event id - * - * Return: 0 on success - */ -int wmi_unified_unregister_event(wmi_unified_t wmi_handle, - uint32_t event_id) +QDF_STATUS wmi_unified_unregister_event(wmi_unified_t wmi_handle, + uint32_t event_id) { uint32_t idx = 0; uint32_t evt_id; @@ -2105,18 +2100,11 @@ int wmi_unified_unregister_event(wmi_unified_t wmi_handle, wmi_handle->event_id[idx] = wmi_handle->event_id[soc->max_event_idx]; - return 0; + return QDF_STATUS_SUCCESS; } -/** - * wmi_unified_unregister_event_handler() - unregister wmi event handler - * @wmi_handle: handle to wmi - * @event_id: wmi event id - * - * Return: 0 on success - */ -int wmi_unified_unregister_event_handler(wmi_unified_t wmi_handle, - wmi_conv_event_id event_id) +QDF_STATUS wmi_unified_unregister_event_handler(wmi_unified_t wmi_handle, + wmi_conv_event_id event_id) { uint32_t idx = 0; uint32_t evt_id; @@ -2151,7 +2139,7 @@ int wmi_unified_unregister_event_handler(wmi_unified_t wmi_handle, wmi_handle->event_id[idx] = wmi_handle->event_id[soc->max_event_idx]; - return 0; + return QDF_STATUS_SUCCESS; } qdf_export_symbol(wmi_unified_unregister_event_handler);