Skip to content
This repository has been archived by the owner on Jul 7, 2021. It is now read-only.

Commit

Permalink
qcacld-3.0: Cleanup residual debug guarding
Browse files Browse the repository at this point in the history
This reverts commit 8da490f ("qcacld-3.0: Enable debugfs usage")

This just simply isn't necessary, we don't use debugfs, and my
initial cautious reasoning for allowing qcacld to utilize it
(custom ROM libperfmgr implementations) never came to be, and never
will at this juncture.

This partially reverts commit 21b2cbe (""qcacld-3.0: Do not compile logging")

While most of this patch will remain intact, subsequent to 0e74ab4
("qcacld-3.0: Merge tag 'LA.UM.9.12.r1-08400-SMxx50.0' into
neutrino-msm-hotdogb-4.14"), wlan_hdd_print_suspend_fail_stats is no longer
guarded by WLAN_DEBUG so drop the trailing #endif relocated by this commit.

Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com>
  • Loading branch information
0ctobot committed Oct 14, 2020
1 parent 2812ae5 commit 5a5ab49
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
6 changes: 4 additions & 2 deletions drivers/staging/qcacld-3.0/configs/default_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,10 @@ ifneq ($(TARGET_BUILD_VARIANT),user)
endif

#Enable WLAN/Power debugfs feature only if debug_fs is enabled
ifeq ($(CONFIG_ANDROID), y)
CONFIG_WLAN_DEBUGFS := y
#ifeq ($(CONFIG_DEBUG_FS), y)
# Flag to enable debugfs. Depends on CONFIG_DEBUG_FS in kernel
# configuration.
# CONFIG_WLAN_DEBUGFS := y

# Flag to enable streamfs. Depends on CONFIG_DEBUG_FS and
# CONFIG_RELAY in kernel configuration.
Expand Down
3 changes: 0 additions & 3 deletions drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
*/

#ifdef WLAN_OPEN_SOURCE
#if defined(CONFIG_ANDROID) && !defined(CONFIG_DEBUG_FS)
#define CONFIG_DEBUG_FS
#endif
#include "osif_sync.h"
#include <wlan_hdd_includes.h>
#include <wlan_hdd_debugfs.h>
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_power.c
Original file line number Diff line number Diff line change
Expand Up @@ -1693,7 +1693,6 @@ static void wlan_hdd_print_suspend_fail_stats(struct hdd_context *hdd_ctx)
stats->suspend_fail[SUSPEND_FAIL_ROAM],
stats->suspend_fail[SUSPEND_FAIL_SCAN],
stats->suspend_fail[SUSPEND_FAIL_INITIAL_WAKEUP]);
#endif
}

void wlan_hdd_inc_suspend_stats(struct hdd_context *hdd_ctx,
Expand Down

0 comments on commit 5a5ab49

Please sign in to comment.