diff --git a/Kbuild b/Kbuild index cd25ce7f7905..b9b9efaae1f7 100644 --- a/Kbuild +++ b/Kbuild @@ -260,8 +260,8 @@ endif ifeq ($(CONFIG_WLAN_SYSFS), y) HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs.o -ifeq ($(CONFIG_WLAN_SYSFS_GET_CHANNEL), y) -HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_get_channel.o +ifeq ($(CONFIG_WLAN_SYSFS_CHANNEL), y) +HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_channel.o endif ifeq ($(CONFIG_WLAN_SET_FW_MODE_CFG), y) HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_set_fw_mode_cfg.o @@ -2785,7 +2785,7 @@ cppflags-$(CONFIG_DFS_FCC_TYPE4_DURATION_CHECK) += -DDFS_FCC_TYPE4_DURATION_CHEC endif cppflags-$(CONFIG_WLAN_SYSFS) += -DWLAN_SYSFS -cppflags-$(CONFIG_WLAN_SYSFS_GET_CHANNEL) += -DWLAN_SYSFS_GET_CHANNEL +cppflags-$(CONFIG_WLAN_SYSFS_CHANNEL) += -DWLAN_SYSFS_CHANNEL cppflags-$(CONFIG_FEATURE_BECN_STATS) += -DWLAN_FEATURE_BEACON_RECEPTION_STATS cppflags-$(CONFIG_WLAN_SYSFS_CONNECT_INFO) += -DWLAN_SYSFS_CONNECT_INFO diff --git a/configs/default_defconfig b/configs/default_defconfig index c050821f3178..ac1ce8a9a9d6 100644 --- a/configs/default_defconfig +++ b/configs/default_defconfig @@ -196,7 +196,7 @@ CONFIG_WLAN_SYSFS := y ifeq ($(CONFIG_WLAN_SYSFS), y) CONFIG_WLAN_SYSFS_GET_STA_INFO := y - CONFIG_WLAN_SYSFS_GET_CHANNEL := y + CONFIG_WLAN_SYSFS_CHANNEL := y CONFIG_WLAN_SET_FW_MODE_CFG := y CONFIG_WLAN_SYSFS_MEM_STATS := y CONFIG_WLAN_REASSOC := y diff --git a/core/hdd/inc/wlan_hdd_sysfs_get_channel.h b/core/hdd/inc/wlan_hdd_sysfs_channel.h similarity index 62% rename from core/hdd/inc/wlan_hdd_sysfs_get_channel.h rename to core/hdd/inc/wlan_hdd_sysfs_channel.h index 2b4691b7a4f8..bb19a3ffb95b 100644 --- a/core/hdd/inc/wlan_hdd_sysfs_get_channel.h +++ b/core/hdd/inc/wlan_hdd_sysfs_channel.h @@ -15,17 +15,17 @@ */ /** - * DOC: wlan_hdd_sysfs_get_channel.h + * DOC: wlan_hdd_sysfs_channel.h * - * implementation for creating sysfs file channel + * Implementation for creating sysfs file channel */ -#ifndef _WLAN_HDD_SYSFS_GET_CHANNEL_H -#define _WLAN_HDD_SYSFS_GET_CHANNEL_H +#ifndef _WLAN_HDD_SYSFS_CHANNEL_H +#define _WLAN_HDD_SYSFS_CHANNEL_H -#if defined(WLAN_SYSFS) && defined(WLAN_SYSFS_GET_CHANNEL) +#if defined(WLAN_SYSFS) && defined(WLAN_SYSFS_CHANNEL) /** - * hdd_sysfs_get_channel_interface_create() - API to create channel sysfs + * hdd_sysfs_channel_interface_create() - API to create channel sysfs * @adapter: pointer to adapter * * this file is created for SAP adapter. @@ -37,25 +37,25 @@ * * Return: none */ -void hdd_sysfs_get_channel_interface_create(struct hdd_adapter *adapter); +void hdd_sysfs_channel_interface_create(struct hdd_adapter *adapter); /** - * hdd_sysfs_get_channel_interface_destroy() - API to destroy channel + * hdd_sysfs_channel_interface_destroy() - API to destroy channel * @adapter: pointer to adapter * * Return: none */ -void hdd_sysfs_get_channel_interface_destroy(struct hdd_adapter *adapter); +void hdd_sysfs_channel_interface_destroy(struct hdd_adapter *adapter); #else static inline -void hdd_sysfs_get_channel_interface_create(struct hdd_adapter *adapter) +void hdd_sysfs_channel_interface_create(struct hdd_adapter *adapter) { } static inline -void hdd_sysfs_get_channel_interface_destroy(struct hdd_adapter *adapter) +void hdd_sysfs_channel_interface_destroy(struct hdd_adapter *adapter) { } #endif -#endif /* #ifndef _WLAN_HDD_SYSFS_GET_CHANNEL_H */ +#endif /* #ifndef _WLAN_HDD_SYSFS_CHANNEL_H */ diff --git a/core/hdd/src/wlan_hdd_sysfs.c b/core/hdd/src/wlan_hdd_sysfs.c index 919df9dbdf56..09fc1c4f055c 100644 --- a/core/hdd/src/wlan_hdd_sysfs.c +++ b/core/hdd/src/wlan_hdd_sysfs.c @@ -38,7 +38,7 @@ #endif #include "osif_sync.h" #include "wlan_hdd_sysfs_get_sta_info.h" -#include "wlan_hdd_sysfs_get_channel.h" +#include "wlan_hdd_sysfs_channel.h" #include #include #include @@ -702,7 +702,7 @@ hdd_sysfs_destroy_sta_adapter_root_obj(struct hdd_adapter *adapter) static void hdd_sysfs_create_sap_adapter_root_obj(struct hdd_adapter *adapter) { - hdd_sysfs_get_channel_interface_create(adapter); + hdd_sysfs_channel_interface_create(adapter); hdd_sysfs_get_sta_info_interface_create(adapter); hdd_sysfs_crash_inject_create(adapter); hdd_sysfs_suspend_create(adapter); @@ -750,7 +750,7 @@ hdd_sysfs_destroy_sap_adapter_root_obj(struct hdd_adapter *adapter) hdd_sysfs_suspend_destroy(adapter); hdd_sysfs_crash_inject_destroy(adapter); hdd_sysfs_get_sta_info_interface_destroy(adapter); - hdd_sysfs_get_channel_interface_destroy(adapter); + hdd_sysfs_channel_interface_destroy(adapter); } static void diff --git a/core/hdd/src/wlan_hdd_sysfs_get_channel.c b/core/hdd/src/wlan_hdd_sysfs_channel.c similarity index 91% rename from core/hdd/src/wlan_hdd_sysfs_get_channel.c rename to core/hdd/src/wlan_hdd_sysfs_channel.c index 4f130f8da55d..4ed1b3e92fef 100644 --- a/core/hdd/src/wlan_hdd_sysfs_get_channel.c +++ b/core/hdd/src/wlan_hdd_sysfs_channel.c @@ -15,14 +15,14 @@ */ /** - * DOC: wlan_hdd_sysfs_get_channel.c + * DOC: wlan_hdd_sysfs_channel.c * * implementation for creating sysfs file channel */ #include #include "osif_vdev_sync.h" -#include "wlan_hdd_sysfs_get_channel.h" +#include "wlan_hdd_sysfs_channel.h" static ssize_t __show_channel_number(struct net_device *net_dev, char *buf) { @@ -80,7 +80,7 @@ static ssize_t show_channel_number(struct device *dev, static DEVICE_ATTR(channel, 0444, show_channel_number, NULL); -void hdd_sysfs_get_channel_interface_create(struct hdd_adapter *adapter) +void hdd_sysfs_channel_interface_create(struct hdd_adapter *adapter) { int error; @@ -89,7 +89,7 @@ void hdd_sysfs_get_channel_interface_create(struct hdd_adapter *adapter) hdd_err("Could not create channel sysfs file"); } -void hdd_sysfs_get_channel_interface_destroy(struct hdd_adapter *adapter) +void hdd_sysfs_channel_interface_destroy(struct hdd_adapter *adapter) { device_remove_file(&adapter->dev->dev, &dev_attr_channel); }