From c9933da31827cab82fe4bb8258f5d49962443bc4 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 9 Jul 2020 16:13:50 -0700 Subject: [PATCH] qcacld-3.0: Rename file name and function name for sysfs 'tx_stbc' Rename file name and modify function names to keep it inline with sysfs attribute name 'tx_stbc' Change-Id: I274c1405fab7385202431b48d65603c38783222b CRs-Fixed: 2731064 --- Kbuild | 6 ++--- configs/default_defconfig | 2 +- core/hdd/src/wlan_hdd_sysfs.c | 10 ++++---- core/hdd/src/wlan_hdd_sysfs_dp_trace.c | 2 +- ...get_tx_stbc.c => wlan_hdd_sysfs_tx_stbc.c} | 20 ++++++++-------- ...get_tx_stbc.h => wlan_hdd_sysfs_tx_stbc.h} | 24 +++++++++---------- 6 files changed, 32 insertions(+), 32 deletions(-) rename core/hdd/src/{wlan_hdd_sysfs_get_tx_stbc.c => wlan_hdd_sysfs_tx_stbc.c} (84%) rename core/hdd/src/{wlan_hdd_sysfs_get_tx_stbc.h => wlan_hdd_sysfs_tx_stbc.h} (66%) diff --git a/Kbuild b/Kbuild index cac2d9e6ede9..5cc3d6d49add 100644 --- a/Kbuild +++ b/Kbuild @@ -301,8 +301,8 @@ endif ifeq ($(CONFIG_WLAN_WOWL_DEL_PTRN), y) HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_wowl_del_ptrn.o endif -ifeq ($(CONFIG_WLAN_GET_TX_STBC), y) -HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_get_tx_stbc.o +ifeq ($(CONFIG_WLAN_SYSFS_TX_STBC), y) +HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_tx_stbc.o endif ifeq ($(CONFIG_WLAN_GET_STATS), y) HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_get_stats.o @@ -2644,7 +2644,7 @@ cppflags-$(CONFIG_WLAN_SCAN_DISABLE) += -DCONFIG_WLAN_SCAN_DISABLE cppflags-$(CONFIG_WLAN_WOW_ITO) += -DCONFIG_WLAN_WOW_ITO cppflags-$(CONFIG_WLAN_WOWL_ADD_PTRN) += -DCONFIG_WLAN_WOWL_ADD_PTRN cppflags-$(CONFIG_WLAN_WOWL_DEL_PTRN) += -DCONFIG_WLAN_WOWL_DEL_PTRN -cppflags-$(CONFIG_WLAN_GET_TX_STBC) += -DCONFIG_WLAN_GET_TX_STBC +cppflags-$(CONFIG_WLAN_SYSFS_TX_STBC) += -DCONFIG_WLAN_SYSFS_TX_STBC cppflags-$(CONFIG_WLAN_GET_STATS) += -DCONFIG_WLAN_GET_STATS cppflags-$(CONFIG_WLAN_SET_WLAN_DBG) += -DCONFIG_WLAN_SET_WLAN_DBG cppflags-$(CONFIG_WLAN_TXRX_FW_ST_RST) += -DCONFIG_WLAN_TXRX_FW_ST_RST diff --git a/configs/default_defconfig b/configs/default_defconfig index 9bc0c734c80e..7620bb2ebb4d 100644 --- a/configs/default_defconfig +++ b/configs/default_defconfig @@ -206,7 +206,7 @@ ifeq ($(CONFIG_WLAN_SYSFS), y) CONFIG_WLAN_WOW_ITO := y CONFIG_WLAN_WOWL_ADD_PTRN := y CONFIG_WLAN_WOWL_DEL_PTRN := y - CONFIG_WLAN_GET_TX_STBC := y + CONFIG_WLAN_SYSFS_TX_STBC := y CONFIG_WLAN_GET_STATS := y CONFIG_WLAN_SET_WLAN_DBG := y CONFIG_WLAN_TXRX_FW_ST_RST := y diff --git a/core/hdd/src/wlan_hdd_sysfs.c b/core/hdd/src/wlan_hdd_sysfs.c index caae4bfc792c..34cd947ea89d 100644 --- a/core/hdd/src/wlan_hdd_sysfs.c +++ b/core/hdd/src/wlan_hdd_sysfs.c @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include @@ -656,7 +656,7 @@ hdd_sysfs_create_sta_adapter_root_obj(struct hdd_adapter *adapter) hdd_sysfs_dcm_create(adapter); hdd_sysfs_wowl_add_ptrn_create(adapter); hdd_sysfs_wowl_del_ptrn_create(adapter); - hdd_sysfs_get_tx_stbc_create(adapter); + hdd_sysfs_tx_stbc_create(adapter); hdd_sysfs_get_stats_create(adapter); hdd_sysfs_txrx_fw_st_rst_create(adapter); hdd_sysfs_gtx_bw_mask_create(adapter); @@ -686,7 +686,7 @@ hdd_sysfs_destroy_sta_adapter_root_obj(struct hdd_adapter *adapter) hdd_sysfs_gtx_bw_mask_destroy(adapter); hdd_sysfs_txrx_fw_st_rst_destroy(adapter); hdd_sysfs_get_stats_destroy(adapter); - hdd_sysfs_get_tx_stbc_destroy(adapter); + hdd_sysfs_tx_stbc_destroy(adapter); hdd_sysfs_wowl_del_ptrn_destroy(adapter); hdd_sysfs_wowl_add_ptrn_destroy(adapter); hdd_sysfs_dcm_destroy(adapter); @@ -710,7 +710,7 @@ hdd_sysfs_create_sap_adapter_root_obj(struct hdd_adapter *adapter) hdd_sysfs_unit_test_target_create(adapter); hdd_sysfs_modify_acl_create(adapter); hdd_sysfs_connect_info_interface_create(adapter); - hdd_sysfs_get_tx_stbc_create(adapter); + hdd_sysfs_tx_stbc_create(adapter); hdd_sysfs_get_stats_create(adapter); hdd_sysfs_txrx_fw_st_rst_create(adapter); hdd_sysfs_gtx_bw_mask_create(adapter); @@ -742,7 +742,7 @@ hdd_sysfs_destroy_sap_adapter_root_obj(struct hdd_adapter *adapter) hdd_sysfs_gtx_bw_mask_destroy(adapter); hdd_sysfs_txrx_fw_st_rst_destroy(adapter); hdd_sysfs_get_stats_destroy(adapter); - hdd_sysfs_get_tx_stbc_destroy(adapter); + hdd_sysfs_tx_stbc_destroy(adapter); hdd_sysfs_connect_info_interface_destroy(adapter); hdd_sysfs_modify_acl_destroy(adapter); hdd_sysfs_unit_test_target_destroy(adapter); diff --git a/core/hdd/src/wlan_hdd_sysfs_dp_trace.c b/core/hdd/src/wlan_hdd_sysfs_dp_trace.c index 8f423dc9af5f..dfd133147803 100644 --- a/core/hdd/src/wlan_hdd_sysfs_dp_trace.c +++ b/core/hdd/src/wlan_hdd_sysfs_dp_trace.c @@ -112,7 +112,7 @@ hdd_sysfs_set_dp_trace_store(struct kobject *kobj, } static struct kobj_attribute set_dp_trace_attribute = - __ATTR(dp_trace, 0220, NULL, + __ATTR(set_dp_trace, 0220, NULL, hdd_sysfs_set_dp_trace_store); static uint32_t dump_dp_trace_count = 0; diff --git a/core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.c b/core/hdd/src/wlan_hdd_sysfs_tx_stbc.c similarity index 84% rename from core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.c rename to core/hdd/src/wlan_hdd_sysfs_tx_stbc.c index 1b1ea00e1903..502ebb8d7018 100644 --- a/core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.c +++ b/core/hdd/src/wlan_hdd_sysfs_tx_stbc.c @@ -15,7 +15,7 @@ */ /** - * DOC: wlan_hdd_sysfs_get_tx_stbc.c + * DOC: wlan_hdd_sysfs_tx_stbc.c * * implementation for creating sysfs file tx_stbc */ @@ -24,7 +24,7 @@ #include #include "osif_vdev_sync.h" #include "sme_api.h" -#include +#include static int hdd_sysfs_get_tx_stbc(struct hdd_adapter *adapter, int *value) { @@ -45,7 +45,7 @@ static int hdd_sysfs_get_tx_stbc(struct hdd_adapter *adapter, int *value) } static ssize_t -__hdd_sysfs_get_tx_stbc_show(struct net_device *net_dev, char *buf) +__hdd_sysfs_tx_stbc_show(struct net_device *net_dev, char *buf) { struct hdd_adapter *adapter = netdev_priv(net_dev); struct hdd_context *hdd_ctx; @@ -75,9 +75,9 @@ __hdd_sysfs_get_tx_stbc_show(struct net_device *net_dev, char *buf) } static ssize_t -hdd_sysfs_get_tx_stbc_show(struct device *dev, - struct device_attribute *attr, - char *buf) +hdd_sysfs_tx_stbc_show(struct device *dev, + struct device_attribute *attr, + char *buf) { struct net_device *net_dev = container_of(dev, struct net_device, dev); struct osif_vdev_sync *vdev_sync; @@ -87,7 +87,7 @@ hdd_sysfs_get_tx_stbc_show(struct device *dev, if (err_size) return err_size; - err_size = __hdd_sysfs_get_tx_stbc_show(net_dev, buf); + err_size = __hdd_sysfs_tx_stbc_show(net_dev, buf); osif_vdev_sync_op_stop(vdev_sync); @@ -95,9 +95,9 @@ hdd_sysfs_get_tx_stbc_show(struct device *dev, } static DEVICE_ATTR(tx_stbc, 0440, - hdd_sysfs_get_tx_stbc_show, NULL); + hdd_sysfs_tx_stbc_show, NULL); -int hdd_sysfs_get_tx_stbc_create(struct hdd_adapter *adapter) +int hdd_sysfs_tx_stbc_create(struct hdd_adapter *adapter) { int error; @@ -109,7 +109,7 @@ int hdd_sysfs_get_tx_stbc_create(struct hdd_adapter *adapter) return error; } -void hdd_sysfs_get_tx_stbc_destroy(struct hdd_adapter *adapter) +void hdd_sysfs_tx_stbc_destroy(struct hdd_adapter *adapter) { device_remove_file(&adapter->dev->dev, &dev_attr_tx_stbc); } diff --git a/core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.h b/core/hdd/src/wlan_hdd_sysfs_tx_stbc.h similarity index 66% rename from core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.h rename to core/hdd/src/wlan_hdd_sysfs_tx_stbc.h index 6ed2ca87782f..3c7ccc011d45 100644 --- a/core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.h +++ b/core/hdd/src/wlan_hdd_sysfs_tx_stbc.h @@ -15,17 +15,17 @@ */ /** - * DOC: wlan_hdd_sysfs_get_tx_stbc.h + * DOC: wlan_hdd_sysfs_tx_stbc.h * - * implementation for creating sysfs file tx_stbc + * Implementation for creating sysfs file tx_stbc */ -#ifndef _WLAN_HDD_SYSFS_GET_TX_STBC_H -#define _WLAN_HDD_SYSFS_GET_TX_STBC_H +#ifndef _WLAN_HDD_SYSFS_TX_STBC_H +#define _WLAN_HDD_SYSFS_TX_STBC_H -#if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_GET_TX_STBC) +#if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SYSFS_TX_STBC) /** - * hdd_sysfs_get_tx_stbc_create() - API to create tx_stbc sysfs file + * hdd_sysfs_tx_stbc_create() - API to create tx_stbc sysfs file * @adapter: pointer to adapter * * this file is created per adapter. @@ -37,26 +37,26 @@ * * Return: 0 on success and errno on failure */ -int hdd_sysfs_get_tx_stbc_create(struct hdd_adapter *adapter); +int hdd_sysfs_tx_stbc_create(struct hdd_adapter *adapter); /** - * hdd_sysfs_get_tx_stbc_destroy() - + * hdd_sysfs_tx_stbc_destroy() - * API to destroy tx_stbc sysfs file * @adapter: pointer to adapter * * Return: none */ -void hdd_sysfs_get_tx_stbc_destroy(struct hdd_adapter *adapter); +void hdd_sysfs_tx_stbc_destroy(struct hdd_adapter *adapter); #else static inline int -hdd_sysfs_get_tx_stbc_create(struct hdd_adapter *adapter) +hdd_sysfs_tx_stbc_create(struct hdd_adapter *adapter) { return 0; } static inline void -hdd_sysfs_get_tx_stbc_destroy(struct hdd_adapter *adapter) +hdd_sysfs_tx_stbc_destroy(struct hdd_adapter *adapter) { } #endif -#endif /* #ifndef _WLAN_HDD_SYSFS_GET_TX_STBC_H */ +#endif /* #ifndef _WLAN_HDD_SYSFS_TX_STBC_H */