From 6569f97e671914fd0fbc0ae275dc35b5d58324f5 Mon Sep 17 00:00:00 2001 From: Alan Chen Date: Fri, 17 Jan 2020 15:35:18 -0800 Subject: [PATCH] qcacld-3.0: Use QDF API to check driver unload in DSC Use newly defined QDF API in CMN qdf_is_driver_unloading() to check if driver unload is in progress in DSC. Change-Id: I2958c6cc3ee6f2ac4302e2dbbf1c68d986fea175 CRs-Fixed: 2605706 --- components/dsc/src/wlan_dsc_vdev.c | 4 ++-- core/cds/src/cds_api.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/dsc/src/wlan_dsc_vdev.c b/components/dsc/src/wlan_dsc_vdev.c index a50411f80d8a..8bc42ed52bf7 100644 --- a/components/dsc/src/wlan_dsc_vdev.c +++ b/components/dsc/src/wlan_dsc_vdev.c @@ -22,7 +22,7 @@ #include "qdf_types.h" #include "__wlan_dsc.h" #include "wlan_dsc.h" -#include "cds_api.h" +#include "qdf_platform.h" #define __dsc_driver_lock(vdev) __dsc_lock((vdev)->psoc->driver) #define __dsc_driver_unlock(vdev) __dsc_unlock((vdev)->psoc->driver) @@ -146,7 +146,7 @@ static QDF_STATUS __dsc_vdev_can_trans(struct dsc_vdev *vdev) * to avoid wifi on failure while previous psoc idle shutdown * is in progress and wifi is turned on. */ - if (cds_is_driver_unloading() || qdf_is_recovering()) + if (qdf_is_driver_unloading() || qdf_is_recovering()) return QDF_STATUS_E_INVAL; else return QDF_STATUS_E_AGAIN; diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index ad5ec94c1217..bb14d43b70d1 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -197,6 +197,7 @@ QDF_STATUS cds_init(void) qdf_register_self_recovery_callback(__cds_trigger_recovery); qdf_register_fw_down_callback(cds_is_fw_down); + qdf_register_is_driver_unloading_callback(cds_is_driver_unloading); qdf_register_recovering_state_query_callback(cds_is_driver_recovering); qdf_register_drv_connected_callback(cds_is_drv_connected); qdf_register_wmi_send_recv_qmi_callback(cds_wmi_send_recv_qmi); @@ -223,6 +224,7 @@ void cds_deinit(void) qdf_register_recovering_state_query_callback(NULL); qdf_register_fw_down_callback(NULL); + qdf_register_is_driver_unloading_callback(NULL); qdf_register_self_recovery_callback(NULL); qdf_register_wmi_send_recv_qmi_callback(NULL);