diff options
| author | Poddar, Siddarth <siddpodd@codeaurora.org> | 2017-07-19 14:58:30 +0530 |
|---|---|---|
| committer | snandini <snandini@codeaurora.org> | 2017-08-09 02:46:31 -0700 |
| commit | cd96f20d5654d4e6734605adc31056bbdf2cc03f (patch) | |
| tree | bdea96652ef53021b5e25e57c254d77d5e332eb6 | |
| parent | 25b51220323894d908392493279defe483bccc26 (diff) | |
qcacld-3.0: Add missing qdf_spinlock_destroy() to free debug cookie
Add missing qdf_spinlock_destroy() to destroy spin lock debug cookie
for SLUB build. For normal builds, qdf_spinlock_destroy() is a NO-OP
function.
Change-Id: Idccdc9f7acaea785a600e14304368f53ff7e17d7
CRs-Fixed: 2077964
| -rw-r--r-- | core/sap/dfs/inc/dfs.h | 4 | ||||
| -rw-r--r-- | core/sap/dfs/src/dfs.c | 3 | ||||
| -rw-r--r-- | core/wma/src/wma_main.c | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h index 6e281dd566b5..0fea16d7fc4e 100644 --- a/core/sap/dfs/inc/dfs.h +++ b/core/sap/dfs/inc/dfs.h @@ -145,15 +145,19 @@ enum { #define ATH_DFSQ_LOCK(_dfs) qdf_spin_lock_bh((&(_dfs)->dfs_radarqlock)) #define ATH_DFSQ_UNLOCK(_dfs) qdf_spin_unlock_bh((&(_dfs)->dfs_radarqlock)) #define ATH_DFSQ_LOCK_INIT(_dfs) qdf_spinlock_create(&(_dfs)->dfs_radarqlock) +#define ATH_DFSQ_LOCK_DEINIT(_dfs) qdf_spinlock_destroy(&(_dfs)->dfs_radarqlock) #define ATH_ARQ_LOCK(_dfs) qdf_spin_lock_bh((&(_dfs)->dfs_arqlock)) #define ATH_ARQ_UNLOCK(_dfs) qdf_spin_unlock_bh((&(_dfs)->dfs_arqlock)) #define ATH_ARQ_LOCK_INIT(_dfs) qdf_spinlock_create(&(_dfs)->dfs_arqlock) +#define ATH_ARQ_LOCK_DEINIT(_dfs) qdf_spinlock_destroy(&(_dfs)->dfs_arqlock) #define ATH_DFSEVENTQ_LOCK(_dfs) qdf_spin_lock_bh((&(_dfs)->dfs_eventqlock)) #define ATH_DFSEVENTQ_UNLOCK(_dfs) qdf_spin_unlock_bh((&(_dfs)->dfs_eventqlock)) #define ATH_DFSEVENTQ_LOCK_INIT(_dfs) \ qdf_spinlock_create((&(_dfs)->dfs_eventqlock)) +#define ATH_DFSEVENTQ_LOCK_DEINIT(_dfs) \ + qdf_spinlock_destroy((&(_dfs)->dfs_eventqlock)) /* Mask for time stamp from descriptor */ #define DFS_TSMASK 0xFFFFFFFF /* Shift for time stamp from descriptor */ diff --git a/core/sap/dfs/src/dfs.c b/core/sap/dfs/src/dfs.c index a19d946b8058..016807c7f2d9 100644 --- a/core/sap/dfs/src/dfs.c +++ b/core/sap/dfs/src/dfs.c @@ -532,6 +532,9 @@ void dfs_detach(struct ieee80211com *ic) } dfs_nol_timer_cleanup(dfs); + ATH_DFSQ_LOCK_DEINIT(dfs); + ATH_ARQ_LOCK_DEINIT(dfs); + ATH_DFSEVENTQ_LOCK_DEINIT(dfs); /* XXX? */ ic->ic_dfs = NULL; } diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 1a991f8d79c0..7f97053d1f0e 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -3833,6 +3833,8 @@ QDF_STATUS wma_close(void *cds_ctx) wma_cleanup_hold_req(wma_handle); qdf_wake_lock_destroy(&wma_handle->wmi_cmd_rsp_wake_lock); qdf_runtime_lock_deinit(&wma_handle->wmi_cmd_rsp_runtime_lock); + qdf_spinlock_destroy(&wma_handle->vdev_respq_lock); + qdf_spinlock_destroy(&wma_handle->wma_hold_req_q_lock); for (idx = 0; idx < wma_handle->num_mem_chunks; ++idx) { qdf_mem_free_consistent(wma_handle->qdf_dev, wma_handle->qdf_dev->dev, |