diff options
| author | Jeff Johnson <jjohnson@qca.qualcomm.com> | 2014-03-29 12:45:03 -0700 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-03-31 21:49:06 -0700 |
| commit | fa7d759eba0207775461914df4e5c1f1c82f81ae (patch) | |
| tree | 33d042a111dac7490f41c6dc9f04ab87e5ebd7db | |
| parent | 1add386d506e47c9235dfda0c97f024f0657ba80 (diff) | |
wlan: qcacld: dfs: Fix unused-function warnings
When GCC 4.7 was first introduced to Android, the initial version of
the compiler was warning about things it should not have, and hence
some warnings were suppressed, including unused-function warnings.
The compiler now seems to be correctly warning only about bad
behavior, so clean up the unused functions in DFS in preparation for
re-enabling unused-function warnings in the compiler.
Change-Id: I86313274c22181db71d7d74313c427bf0a233bec
CRs-fixed: 640842
| -rw-r--r-- | CORE/SERVICES/DFS/src/dfs.c | 5 | ||||
| -rw-r--r-- | CORE/SERVICES/DFS/src/dfs_process_phyerr.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/CORE/SERVICES/DFS/src/dfs.c b/CORE/SERVICES/DFS/src/dfs.c index c8d40d5b0049..e4f4bfc34bfa 100644 --- a/CORE/SERVICES/DFS/src/dfs.c +++ b/CORE/SERVICES/DFS/src/dfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -78,6 +78,7 @@ int domainoverride=DFS_UNINIT_DOMAIN; int usenol=1; u_int32_t dfs_debug_level=ATH_DEBUG_DFS; +#if 0 /* the code to call this is curently commented-out below */ /* * Mark a channel as having interference detected upon it. * @@ -126,7 +127,7 @@ dfs_channel_mark_radar(struct ath_dfs *dfs, struct ieee80211_channel *chan) dfs_nol_update(dfs); } } - +#endif /* #if 0 */ static OS_TIMER_FUNC(dfs_task) { diff --git a/CORE/SERVICES/DFS/src/dfs_process_phyerr.c b/CORE/SERVICES/DFS/src/dfs_process_phyerr.c index 489241c88b0c..49a13a3be086 100644 --- a/CORE/SERVICES/DFS/src/dfs_process_phyerr.c +++ b/CORE/SERVICES/DFS/src/dfs_process_phyerr.c @@ -461,6 +461,7 @@ dfs_process_phyerr_merlin(struct ath_dfs *dfs, void *buf, static void dump_phyerr_contents(const char *d, int len) { +#ifdef CONFIG_ENABLE_DUMP_PHYERR_CONTENTS int i, n, bufsize = 64; /* @@ -495,6 +496,7 @@ dump_phyerr_contents(const char *d, int len) */ if (n != 0) VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO, "%s: %s\n", __func__, buf); +#endif /* def CONFIG_ENABLE_DUMP_PHYERR_CONTENTS */ } void @@ -515,7 +517,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, u_int16_t datalen, } dfs->dfs_phyerr_count++; - //dump_phyerr_contents(buf, datalen); + dump_phyerr_contents(buf, datalen); /* * XXX The combined_rssi_ok support has been removed. * This was only clear for Owl. @@ -535,7 +537,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, u_int16_t datalen, * start queueing data for new channel. (EV74162) */ if (dfs->dfs_debug_mask & ATH_DEBUG_DFS_PHYERR_PKT) - //dump_phyerr_contents(buf, datalen); + dump_phyerr_contents(buf, datalen); if (IEEE80211_IS_CHAN_RADAR(chan)) { DFS_DPRINTK(dfs, ATH_DEBUG_DFS1, |