From ac99e473cdd6ab306b59aca1dbd64cfef5518778 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 7 Jun 2018 23:00:08 -0700 Subject: [PATCH] qcacld-3.0: cds: Replace tSirRetStatus with QDF_STATUS The tSirRetStatus definitions are obsolete, so replace them with QDF_STATUS definitions in the cds folder. Change-Id: I689e80fefa0068980a2bf78d2eff13d0892f8d95 CRs-Fixed: 2266521 --- core/cds/src/cds_api.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 4eb959cdda69..d7956a8cbbeb 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -449,7 +449,6 @@ cds_set_ac_specs_params(struct cds_config_info *cds_cfg) QDF_STATUS cds_open(struct wlan_objmgr_psoc *psoc) { QDF_STATUS status; - tSirRetStatus sirStatus = eSIR_SUCCESS; struct cds_config_info *cds_cfg; qdf_device_t qdf_ctx; struct htc_init_info htcInfo; @@ -632,16 +631,13 @@ QDF_STATUS cds_open(struct wlan_objmgr_psoc *psoc) bmi_target_ready(scn, gp_cds_context->cfg_ctx); /* Now proceed to open the MAC */ - sirStatus = - mac_open(psoc, &(gp_cds_context->mac_context), - gp_cds_context->hdd_context, cds_cfg); + status = mac_open(psoc, &(gp_cds_context->mac_context), + gp_cds_context->hdd_context, cds_cfg); - if (eSIR_SUCCESS != sirStatus) { + if (QDF_STATUS_SUCCESS != status) { /* Critical Error ... Cannot proceed further */ cds_alert("Failed to open MAC"); QDF_ASSERT(0); - - status = QDF_STATUS_E_FAILURE; goto err_soc_detach; } @@ -842,7 +838,6 @@ exit_with_status: QDF_STATUS cds_enable(struct wlan_objmgr_psoc *psoc) { QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - tSirRetStatus sirStatus = eSIR_SUCCESS; tHalMacStartParameters halStartParams; /* We support only one instance for now ... */ @@ -874,10 +869,9 @@ QDF_STATUS cds_enable(struct wlan_objmgr_psoc *psoc) sizeof(tHalMacStartParameters)); /* Start the MAC */ - sirStatus = - mac_start(gp_cds_context->mac_context, &halStartParams); + qdf_status = mac_start(gp_cds_context->mac_context, &halStartParams); - if (eSIR_SUCCESS != sirStatus) { + if (QDF_STATUS_SUCCESS != qdf_status) { cds_alert("Failed to start MAC"); goto err_wma_stop; }