From c30f3933ff5bd38d9eb231923cfb7bc287895d80 Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Fri, 25 May 2018 16:48:23 -0700 Subject: [PATCH] qcacld-3.0: Remove wlan_sys_probe wlan_sys_probe has been superseded by the scheduler thread watchdog. Since it is no longer needed, remove wlan_sys_probe. Change-Id: I31e7cf0021774d074a6c94eb6a636e1f87452923 CRs-Fixed: 2249435 --- core/cds/src/cds_api.c | 6 ++---- core/mac/src/sys/common/inc/wlan_qct_sys.h | 4 +--- core/mac/src/sys/common/src/wlan_qct_sys.c | 25 ---------------------- 3 files changed, 3 insertions(+), 32 deletions(-) diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index dec2c693b35f..b732bd651e72 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -843,10 +843,8 @@ QDF_STATUS cds_pre_enable(void) "%s: wma_pre_start reporting other error", __func__); } - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s: Test MC thread by posting a probe message to SYS", - __func__); - wlan_sys_probe(); + + cds_trigger_recovery(QDF_REASON_UNSPECIFIED); QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; diff --git a/core/mac/src/sys/common/inc/wlan_qct_sys.h b/core/mac/src/sys/common/inc/wlan_qct_sys.h index bc5175e2f0f9..ae6378edf443 100644 --- a/core/mac/src/sys/common/inc/wlan_qct_sys.h +++ b/core/mac/src/sys/common/inc/wlan_qct_sys.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -99,6 +99,4 @@ QDF_STATUS umac_stop(void); QDF_STATUS sys_mc_process_handler(struct scheduler_msg *msg); -void wlan_sys_probe(void); - #endif /* WLAN_QCT_SYS_H__ */ diff --git a/core/mac/src/sys/common/src/wlan_qct_sys.c b/core/mac/src/sys/common/src/wlan_qct_sys.c index 68ff7c2cefb0..7ef0e11bf8ca 100644 --- a/core/mac/src/sys/common/src/wlan_qct_sys.c +++ b/core/mac/src/sys/common/src/wlan_qct_sys.c @@ -172,15 +172,6 @@ static QDF_STATUS sys_mc_process_msg(struct scheduler_msg *pMsg) ((sys_rsp_cb) pMsg->callback)(pMsg->bodyptr); qdf_status = QDF_STATUS_SUCCESS; break; - case SYS_MSG_ID_MC_THR_PROBE: - /* - * Process MC thread probe. Just callback to the - * function that is in the message. - */ - QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, - "Rx SYS_MSG_ID_MC_THR_PROBE msgType=%d[0x%08x]", - pMsg->type, pMsg->type); - break; case SYS_MSG_ID_DATA_STALL_MSG: data_stall_detect_callback = pMsg->callback; @@ -306,19 +297,3 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, struct scheduler_msg *pMsg) } -/** - * wlan_sys_probe() - API to post MC thread probe - * - * This API will be used send probe message - * - * Return: none - */ -void wlan_sys_probe(void) -{ - struct scheduler_msg message = {0}; - - message.reserved = SYS_MSG_COOKIE; - message.type = SYS_MSG_ID_MC_THR_PROBE; - message.bodyptr = NULL; - scheduler_post_msg(QDF_MODULE_ID_SYS, &message); -}