From 40502e26b40a949661611bb19e59c6a06a2ca5eb Mon Sep 17 00:00:00 2001 From: Alok Sing Date: Wed, 26 Aug 2020 19:08:49 +0530 Subject: [PATCH] qcacmn: Change return type to QDF_STATUS wmi_unified_register_event return QDF_STATUS Handle same return type in caller function CRs-Fixed: 2764185 Change-Id: I87b1e6ee5e06e4e6af81395d977595335fe0bc5c --- target_if/spectral/target_if_spectral.c | 22 +++++++++++++++++----- target_if/spectral/target_if_spectral.h | 7 ++++--- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/target_if/spectral/target_if_spectral.c b/target_if/spectral/target_if_spectral.c index 3e1b364a5074..3c651854bf0c 100644 --- a/target_if/spectral/target_if_spectral.c +++ b/target_if/spectral/target_if_spectral.c @@ -5165,6 +5165,7 @@ target_if_spectral_wmi_unified_register_event_handler( { wmi_unified_t wmi_handle; struct target_if_psoc_spectral *psoc_spectral; + QDF_STATUS ret; if (!psoc) { spectral_err("psoc is null"); @@ -5183,8 +5184,10 @@ target_if_spectral_wmi_unified_register_event_handler( return qdf_status_to_os_return(QDF_STATUS_E_FAILURE); } - return psoc_spectral->wmi_ops.wmi_unified_register_event_handler( + ret = psoc_spectral->wmi_ops.wmi_unified_register_event_handler( wmi_handle, event_id, handler_func, rx_ctx); + + return qdf_status_to_os_return(ret); } /** @@ -5204,6 +5207,7 @@ target_if_spectral_wmi_unified_unregister_event_handler( { wmi_unified_t wmi_handle; struct target_if_psoc_spectral *psoc_spectral; + QDF_STATUS ret; if (!psoc) { spectral_err("psoc is null"); @@ -5222,8 +5226,10 @@ target_if_spectral_wmi_unified_unregister_event_handler( return qdf_status_to_os_return(QDF_STATUS_E_FAILURE); } - return psoc_spectral->wmi_ops.wmi_unified_unregister_event_handler( + ret = psoc_spectral->wmi_ops.wmi_unified_unregister_event_handler( wmi_handle, event_id); + + return qdf_status_to_os_return(ret); } /** @@ -5370,6 +5376,7 @@ target_if_spectral_wmi_unified_register_event_handler( uint8_t rx_ctx) { wmi_unified_t wmi_handle; + QDF_STATUS ret; if (!psoc) { spectral_err("psoc is null"); @@ -5382,8 +5389,10 @@ target_if_spectral_wmi_unified_register_event_handler( return qdf_status_to_os_return(QDF_STATUS_E_INVAL); } - return wmi_unified_register_event_handler(wmi_handle, event_id, - handler_func, rx_ctx); + ret = wmi_unified_register_event_handler(wmi_handle, event_id, + handler_func, rx_ctx); + + return qdf_status_to_os_return(ret); } /** @@ -5402,6 +5411,7 @@ target_if_spectral_wmi_unified_unregister_event_handler( wmi_conv_event_id event_id) { wmi_unified_t wmi_handle; + QDF_STATUS ret; if (!psoc) { spectral_err("psoc is null"); @@ -5414,7 +5424,9 @@ target_if_spectral_wmi_unified_unregister_event_handler( return qdf_status_to_os_return(QDF_STATUS_E_INVAL); } - return wmi_unified_unregister_event_handler(wmi_handle, event_id); + ret = wmi_unified_unregister_event_handler(wmi_handle, event_id); + + return qdf_status_to_os_return(ret); } /** diff --git a/target_if/spectral/target_if_spectral.h b/target_if/spectral/target_if_spectral.h index bcd8a6b1b0dd..1ff8609ee436 100644 --- a/target_if/spectral/target_if_spectral.h +++ b/target_if/spectral/target_if_spectral.h @@ -852,13 +852,14 @@ struct spectral_wmi_ops { QDF_STATUS (*wmi_extract_pdev_sscan_fft_bin_index)( wmi_unified_t wmi_handle, uint8_t *evt_buf, struct spectral_fft_bin_markers_160_165mhz *param); - int (*wmi_unified_register_event_handler)( + 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); - 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); }; /**