summaryrefslogtreecommitdiff
path: root/core/hdd
diff options
context:
space:
mode:
authorhsuvictor <hsuvictor@google.com>2020-06-11 14:22:57 +0800
committerhsuvictor <hsuvictor@google.com>2020-06-11 14:29:17 +0800
commitb820780edb1bd11a63b38bd52dc2bd4a7ca9e3f8 (patch)
treea853b4f0eb5a8cc1f2cf9258e1491bc0e59a16e7 /core/hdd
parentc884c9d5fd7f21991d79ea379bc0148049cc9da3 (diff)
downloadqcacld-b820780edb1bd11a63b38bd52dc2bd4a7ca9e3f8.tar.gz
Revert "GKI: Fix disabling DEBUG_FS compilation issues"
This reverts commit 1c9587d345c959d81b1fe1a1fa2cae829e16ac77. Bug: 156992483 Change-Id: I010f1ed3b64f6ffa9b3451cd8879646646459ec9
Diffstat (limited to 'core/hdd')
-rw-r--r--core/hdd/inc/wlan_hdd_sysfs.h29
-rw-r--r--core/hdd/src/wlan_hdd_sysfs.c6
2 files changed, 13 insertions, 22 deletions
diff --git a/core/hdd/inc/wlan_hdd_sysfs.h b/core/hdd/inc/wlan_hdd_sysfs.h
index 3112731874..4ee128b38e 100644
--- a/core/hdd/inc/wlan_hdd_sysfs.h
+++ b/core/hdd/inc/wlan_hdd_sysfs.h
@@ -48,6 +48,18 @@ void hdd_sysfs_create_version_interface(struct wlan_objmgr_psoc *psoc);
* Return: none
*/
void hdd_sysfs_destroy_version_interface(void);
+/**
+ * hdd_sysfs_create_powerstats_interface() - create power_stats interface
+ *
+ * Return: none
+ */
+void hdd_sysfs_create_powerstats_interface(void);
+/**
+ * hdd_sysfs_destroy_powerstats_interface() - destroy power_stats interface
+ *
+ * Return: none
+ */
+void hdd_sysfs_destroy_powerstats_interface(void);
#else
static inline
void hdd_sysfs_create_driver_root_obj(void)
@@ -68,22 +80,7 @@ static inline
void hdd_sysfs_destroy_version_interface(void)
{
}
-#endif
-#if defined(WLAN_SYSFS) && defined(WLAN_POWER_DEBUGFS)
-/**
- * hdd_sysfs_create_powerstats_interface() - create power_stats interface
- *
- * Return: none
- */
-void hdd_sysfs_create_powerstats_interface(void);
-/**
- * hdd_sysfs_destroy_powerstats_interface() - destroy power_stats interface
- *
- * Return: none
- */
-void hdd_sysfs_destroy_powerstats_interface(void);
-#else
static inline
void hdd_sysfs_create_powerstats_interface(void)
{
@@ -93,7 +90,7 @@ static inline
void hdd_sysfs_destroy_powerstats_interface(void)
{
}
-#endif /* defined(WLAN_SYSFS) && defined(WLAN_POWER_DEBUGFS) */
+#endif
#ifdef WLAN_FEATURE_BEACON_RECEPTION_STATS
/**
diff --git a/core/hdd/src/wlan_hdd_sysfs.c b/core/hdd/src/wlan_hdd_sysfs.c
index fe849473f4..bc722beca6 100644
--- a/core/hdd/src/wlan_hdd_sysfs.c
+++ b/core/hdd/src/wlan_hdd_sysfs.c
@@ -123,7 +123,6 @@ static ssize_t show_fw_version(struct kobject *kobj,
return length;
};
-#ifdef WLAN_POWER_DEBUGFS
struct power_stats_priv {
struct power_stats_response power_stats;
};
@@ -274,7 +273,6 @@ static ssize_t show_device_power_stats(struct kobject *kobj,
return length;
}
-#endif /* WLAN_POWER_DEBUGFS */
#ifdef WLAN_FEATURE_BEACON_RECEPTION_STATS
struct beacon_reception_stats_priv {
@@ -433,10 +431,8 @@ static struct kobj_attribute dr_ver_attribute =
__ATTR(driver_version, 0440, show_driver_version, NULL);
static struct kobj_attribute fw_ver_attribute =
__ATTR(version, 0440, show_fw_version, NULL);
-#ifdef WLAN_POWER_DEBUGFS
static struct kobj_attribute power_stats_attribute =
__ATTR(power_stats, 0444, show_device_power_stats, NULL);
-#endif /* WLAN_POWER_DEBUGFS */
void hdd_sysfs_create_version_interface(struct wlan_objmgr_psoc *psoc)
{
@@ -497,7 +493,6 @@ void hdd_sysfs_destroy_version_interface(void)
}
}
-#ifdef WLAN_POWER_DEBUGFS
void hdd_sysfs_create_powerstats_interface(void)
{
int error;
@@ -520,7 +515,6 @@ void hdd_sysfs_destroy_powerstats_interface(void)
}
sysfs_remove_file(driver_kobject, &power_stats_attribute.attr);
}
-#endif /* WLAN_POWER_DEBUGFS */
void hdd_sysfs_create_driver_root_obj(void)
{