A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 14:13:01 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Remove cds_context param to cds_enable()

Browse source 
Currently cds_enable() takes a cds_context param. However CDS already
maintains its own context, hence this param introduces an unnecessary
coupling, so remove it.

Change-Id: I13a9a0cbdb8b869f8f543c4f7f89cffbcf4fd210
CRs-Fixed: 2109427
This commit is contained in:
Jeff Johnson 2017-09-13 14:16:08 -07:00
commit 8f9dd5fd64
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/cds/inc/cds_api.h
View file

@ -313,7 +313,7 @@ QDF_STATUS cds_pre_enable(void);
QDF_STATUS cds_open(struct wlan_objmgr_psoc *psoc);
QDF_STATUS cds_enable(struct wlan_objmgr_psoc *psoc, v_CONTEXT_t cds_context);
QDF_STATUS cds_enable(struct wlan_objmgr_psoc *psoc);
QDF_STATUS cds_disable(struct wlan_objmgr_psoc *psoc, v_CONTEXT_t cds_context);

21
core/cds/src/cds_api.c
View file

@ -812,23 +812,22 @@ QDF_STATUS cds_pre_enable(void)
*
* Return: QDF status
*/
QDF_STATUS cds_enable(struct wlan_objmgr_psoc *psoc, v_CONTEXT_t cds_context)
QDF_STATUS cds_enable(struct wlan_objmgr_psoc *psoc)
{
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
tSirRetStatus sirStatus = eSIR_SUCCESS;
p_cds_contextType p_cds_context = (p_cds_contextType) cds_context;
tHalMacStartParameters halStartParams;
/* We support only one instance for now ... */
if (gp_cds_context != p_cds_context) {
if (!gp_cds_context) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"%s: mismatch in context", __func__);
"%s: Invalid CDS context", __func__);
return QDF_STATUS_E_FAILURE;
}
if ((p_cds_context->pWMAContext == NULL) ||
(p_cds_context->pMACContext == NULL)) {
if (p_cds_context->pWMAContext == NULL)
if ((gp_cds_context->pWMAContext == NULL) ||
(gp_cds_context->pMACContext == NULL)) {
if (gp_cds_context->pWMAContext == NULL)
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"%s: WMA NULL context", __func__);
else
@ -854,7 +853,7 @@ QDF_STATUS cds_enable(struct wlan_objmgr_psoc *psoc, v_CONTEXT_t cds_context)
/* Start the MAC */
sirStatus =
mac_start(p_cds_context->pMACContext, &halStartParams);
mac_start(gp_cds_context->pMACContext, &halStartParams);
if (eSIR_SUCCESS != sirStatus) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
@ -866,7 +865,7 @@ QDF_STATUS cds_enable(struct wlan_objmgr_psoc *psoc, v_CONTEXT_t cds_context)
"%s: MAC correctly started", __func__);
/* START SME */
qdf_status = sme_start(p_cds_context->pMACContext);
qdf_status = sme_start(gp_cds_context->pMACContext);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
@ -901,10 +900,10 @@ err_soc_target_detach:
/* NOOP */
err_sme_stop:
sme_stop(p_cds_context->pMACContext, HAL_STOP_TYPE_SYS_RESET);
sme_stop(gp_cds_context->pMACContext, HAL_STOP_TYPE_SYS_RESET);
err_mac_stop:
mac_stop(p_cds_context->pMACContext, HAL_STOP_TYPE_SYS_RESET);
mac_stop(gp_cds_context->pMACContext, HAL_STOP_TYPE_SYS_RESET);
err_wma_stop:
qdf_event_reset(&(gp_cds_context->wmaCompleteEvent));

2
core/hdd/src/wlan_hdd_main.c
View file

@ -9213,7 +9213,7 @@ int hdd_configure_cds(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter)
* Start CDS which starts up the SME/MAC/HAL modules and everything
* else
*/
status = cds_enable(hdd_ctx->hdd_psoc, hdd_ctx->pcds_context);
status = cds_enable(hdd_ctx->hdd_psoc);
if (!QDF_IS_STATUS_SUCCESS(status)) {
hdd_err("cds_enable failed");