From 85b5c118494304fa76f3204bf189a0e2bbe402b7 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 11 Aug 2017 15:15:23 -0700 Subject: [PATCH] qcacld-3.0: Rename struct hdd_adapter_s The Linux Coding Style eschews the encoding of type information into names, so rename struct hdd_adapter_s to align with that guidance. Change-Id: I2a43671d9233f596b4e10eda4ad8641d7311fad1 CRs-Fixed: 2092733 --- core/hdd/inc/wlan_hdd_assoc.h | 4 ++-- core/hdd/inc/wlan_hdd_debugfs_llstat.h | 16 ++++++++-------- core/hdd/inc/wlan_hdd_main.h | 2 +- core/hdd/inc/wlan_hdd_tsf.h | 8 ++++---- core/hdd/src/wlan_hdd_fips.h | 4 ++-- core/hdd/src/wlan_hdd_hostapd.c | 2 +- core/hdd/src/wlan_hdd_lpass.c | 8 ++++---- core/hdd/src/wlan_hdd_lpass.h | 14 +++++++------- core/hdd/src/wlan_hdd_main.c | 2 +- core/hdd/src/wlan_hdd_nan_datapath.c | 6 +++--- core/hdd/src/wlan_hdd_nan_datapath.h | 10 +++++----- core/hdd/src/wlan_hdd_tsf.c | 6 +++--- 12 files changed, 41 insertions(+), 41 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h index 37b0303287a3..1ff8fe739727 100644 --- a/core/hdd/inc/wlan_hdd_assoc.h +++ b/core/hdd/inc/wlan_hdd_assoc.h @@ -209,7 +209,7 @@ typedef struct connection_info_s { } connection_info_t; /* Forward declarations */ -typedef struct hdd_adapter_s hdd_adapter_t; +typedef struct hdd_adapter hdd_adapter_t; typedef struct hdd_context_s hdd_context_t; typedef struct hdd_station_ctx hdd_station_ctx_t; typedef struct hdd_ap_ctx_s hdd_ap_ctx_t; @@ -338,7 +338,7 @@ QDF_STATUS hdd_update_dp_vdev_flags(void *cbk_data, uint32_t vdev_param, bool is_link_up); -QDF_STATUS hdd_roam_register_sta(struct hdd_adapter_s *adapter, +QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter, struct tagCsrRoamInfo *roam_info, uint8_t sta_id, struct qdf_mac_addr *peer_mac_addr, diff --git a/core/hdd/inc/wlan_hdd_debugfs_llstat.h b/core/hdd/inc/wlan_hdd_debugfs_llstat.h index a56fd608c733..930fef5a7c3b 100644 --- a/core/hdd/inc/wlan_hdd_debugfs_llstat.h +++ b/core/hdd/inc/wlan_hdd_debugfs_llstat.h @@ -52,7 +52,7 @@ * * Return: None */ -void hdd_debugfs_process_peer_stats(struct hdd_adapter_s *adapter, void *data); +void hdd_debugfs_process_peer_stats(struct hdd_adapter *adapter, void *data); /** * hdd_debugfs_process_radio_stats() - Parse Radio stats and add it to buffer @@ -66,7 +66,7 @@ void hdd_debugfs_process_peer_stats(struct hdd_adapter_s *adapter, void *data); * * Return: None */ -void hdd_debugfs_process_radio_stats(struct hdd_adapter_s *adapter, +void hdd_debugfs_process_radio_stats(struct hdd_adapter *adapter, uint32_t more_data, void *data, uint32_t num_radio); /** @@ -81,7 +81,7 @@ void hdd_debugfs_process_radio_stats(struct hdd_adapter_s *adapter, * * Return: None */ -void hdd_debugfs_process_iface_stats(struct hdd_adapter_s *adapter, +void hdd_debugfs_process_iface_stats(struct hdd_adapter *adapter, void *data, uint32_t num_peers); /** @@ -90,25 +90,25 @@ void hdd_debugfs_process_iface_stats(struct hdd_adapter_s *adapter, * * Return: 0 on success and errno on failure */ -int wlan_hdd_create_ll_stats_file(struct hdd_adapter_s *adapter); +int wlan_hdd_create_ll_stats_file(struct hdd_adapter *adapter); #else -static inline void hdd_debugfs_process_peer_stats(struct hdd_adapter_s *adapter, +static inline void hdd_debugfs_process_peer_stats(struct hdd_adapter *adapter, void *data) { } static inline void hdd_debugfs_process_radio_stats( - struct hdd_adapter_s *adapter, + struct hdd_adapter *adapter, uint32_t more_data, void *data, uint32_t num_radio) { } static inline void hdd_debugfs_process_iface_stats( - struct hdd_adapter_s *adapter, + struct hdd_adapter *adapter, void *data, uint32_t num_peers) { } -static inline int wlan_hdd_create_ll_stats_file(struct hdd_adapter_s *adapter) +static inline int wlan_hdd_create_ll_stats_file(struct hdd_adapter *adapter) { return 0; } diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 6610149e0ff4..5f55d85dbe7c 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -933,7 +933,7 @@ struct hdd_connect_pm_context { #endif #endif -struct hdd_adapter_s { +struct hdd_adapter { /* Magic cookie for adapter sanity verification. Note that this * needs to be at the beginning of the private data structure so * that it will exists at the beginning of dev->priv and hence diff --git a/core/hdd/inc/wlan_hdd_tsf.h b/core/hdd/inc/wlan_hdd_tsf.h index c4f5561bb2cd..84368e5303f6 100644 --- a/core/hdd/inc/wlan_hdd_tsf.h +++ b/core/hdd/inc/wlan_hdd_tsf.h @@ -99,7 +99,7 @@ void wlan_hdd_tsf_deinit(hdd_context_t *hdd_ctx); * * Return: 0 for success or non-zero negative failure code */ -int hdd_capture_tsf(struct hdd_adapter_s *adapter, uint32_t *buf, int len); +int hdd_capture_tsf(struct hdd_adapter *adapter, uint32_t *buf, int len); /** * hdd_indicate_tsf() - return tsf to uplayer @@ -112,7 +112,7 @@ int hdd_capture_tsf(struct hdd_adapter_s *adapter, uint32_t *buf, int len); * * Return: Describe the execute result of this routine */ -int hdd_indicate_tsf(struct hdd_adapter_s *adapter, uint32_t *buf, int len); +int hdd_indicate_tsf(struct hdd_adapter *adapter, uint32_t *buf, int len); /** * wlan_hdd_cfg80211_handle_tsf_cmd(): Setup TSF operations @@ -140,14 +140,14 @@ static inline void wlan_hdd_tsf_deinit(hdd_context_t *hdd_ctx) { } -static inline int hdd_indicate_tsf(struct hdd_adapter_s *adapter, uint32_t *buf, +static inline int hdd_indicate_tsf(struct hdd_adapter *adapter, uint32_t *buf, int len) { return -ENOTSUPP; } static inline int -hdd_capture_tsf(struct hdd_adapter_s *adapter, uint32_t *buf, int len) +hdd_capture_tsf(struct hdd_adapter *adapter, uint32_t *buf, int len) { return -ENOTSUPP; } diff --git a/core/hdd/src/wlan_hdd_fips.h b/core/hdd/src/wlan_hdd_fips.h index 03e7c981a7eb..945d5c630ff7 100644 --- a/core/hdd/src/wlan_hdd_fips.h +++ b/core/hdd/src/wlan_hdd_fips.h @@ -28,8 +28,8 @@ struct net_device; struct iw_request_info; union iwreq_data; -struct hdd_adapter_s; -void fips_test(struct hdd_adapter_s *adapter); +struct hdd_adapter; +void fips_test(struct hdd_adapter *adapter); #define FIPS_KEY_LEN 32 struct iw_fips_test_request { diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 1da56f8123ea..2da6132d015e 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -3476,7 +3476,7 @@ static int __iw_softap_get_three(struct net_device *dev, uint32_t sub_cmd = value[0]; int ret = 0; /* success */ struct hdd_context_s *hdd_ctx; - struct hdd_adapter_s *adapter = WLAN_HDD_GET_PRIV_PTR(dev); + struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); diff --git a/core/hdd/src/wlan_hdd_lpass.c b/core/hdd/src/wlan_hdd_lpass.c index 0dc0cd9b7a39..1a766841cbcc 100644 --- a/core/hdd/src/wlan_hdd_lpass.c +++ b/core/hdd/src/wlan_hdd_lpass.c @@ -207,7 +207,7 @@ static int wlan_hdd_gen_wlan_version_pack(struct wlan_version_data *data, * * Return: none */ -static void wlan_hdd_send_status_pkg(struct hdd_adapter_s *adapter, +static void wlan_hdd_send_status_pkg(struct hdd_adapter *adapter, struct hdd_station_ctx *sta_ctx, uint8_t is_on, uint8_t is_connected) { @@ -346,7 +346,7 @@ void hdd_lpass_populate_pmo_config(struct pmo_psoc_cfg *pmo_config, * hdd_lpass_notify_connect() - Notify LPASS of interface connect * (public function documented in wlan_hdd_lpass.h) */ -void hdd_lpass_notify_connect(struct hdd_adapter_s *adapter) +void hdd_lpass_notify_connect(struct hdd_adapter *adapter) { struct hdd_station_ctx *sta_ctx; @@ -367,7 +367,7 @@ void hdd_lpass_notify_connect(struct hdd_adapter_s *adapter) * hdd_lpass_notify_disconnect() - Notify LPASS of interface disconnect * (public function documented in wlan_hdd_lpass.h) */ -void hdd_lpass_notify_disconnect(struct hdd_adapter_s *adapter) +void hdd_lpass_notify_disconnect(struct hdd_adapter *adapter) { struct hdd_station_ctx *sta_ctx; @@ -383,7 +383,7 @@ void hdd_lpass_notify_disconnect(struct hdd_adapter_s *adapter) * implementation note: when one interfaces changes we notify the * state of all of the interfaces. */ -void hdd_lpass_notify_mode_change(struct hdd_adapter_s *adapter) +void hdd_lpass_notify_mode_change(struct hdd_adapter *adapter) { struct hdd_context_s *hdd_ctx; diff --git a/core/hdd/src/wlan_hdd_lpass.h b/core/hdd/src/wlan_hdd_lpass.h index 0fee093b4a21..ac4459773fea 100644 --- a/core/hdd/src/wlan_hdd_lpass.h +++ b/core/hdd/src/wlan_hdd_lpass.h @@ -31,7 +31,7 @@ struct cds_config_info; struct wma_tgt_cfg; struct hdd_context_s; -struct hdd_adapter_s; +struct hdd_adapter; #ifdef WLAN_FEATURE_LPSS /** @@ -82,7 +82,7 @@ void hdd_lpass_populate_pmo_config(struct pmo_psoc_cfg *pmo_config, * * Return: none */ -void hdd_lpass_notify_connect(struct hdd_adapter_s *adapter); +void hdd_lpass_notify_connect(struct hdd_adapter *adapter); /** * hdd_lpass_notify_disconnect() - Notify LPASS of interface disconnect @@ -93,7 +93,7 @@ void hdd_lpass_notify_connect(struct hdd_adapter_s *adapter); * * Return: none */ -void hdd_lpass_notify_disconnect(struct hdd_adapter_s *adapter); +void hdd_lpass_notify_disconnect(struct hdd_adapter *adapter); /** * hdd_lpass_notify_mode_change() - Notify LPASS of interface mode change @@ -104,7 +104,7 @@ void hdd_lpass_notify_disconnect(struct hdd_adapter_s *adapter); * * Return: none */ -void hdd_lpass_notify_mode_change(struct hdd_adapter_s *adapter); +void hdd_lpass_notify_mode_change(struct hdd_adapter *adapter); /** * hdd_lpass_notify_start() - Notify LPASS of driver start @@ -154,13 +154,13 @@ void hdd_lpass_populate_pmo_config(struct pmo_psoc_cfg *pmo_config, { } -static inline void hdd_lpass_notify_connect(struct hdd_adapter_s *adapter) +static inline void hdd_lpass_notify_connect(struct hdd_adapter *adapter) { } -static inline void hdd_lpass_notify_disconnect(struct hdd_adapter_s *adapter) +static inline void hdd_lpass_notify_disconnect(struct hdd_adapter *adapter) { } -static inline void hdd_lpass_notify_mode_change(struct hdd_adapter_s *adapter) +static inline void hdd_lpass_notify_mode_change(struct hdd_adapter *adapter) { } static inline void hdd_lpass_notify_start(struct hdd_context_s *hdd_ctx) { } diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index a830256d1c00..db6d8f0ad480 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -11333,7 +11333,7 @@ void hdd_clean_up_pre_cac_interface(hdd_context_t *hdd_ctx) { uint8_t session_id; QDF_STATUS status; - struct hdd_adapter_s *precac_adapter; + struct hdd_adapter *precac_adapter; status = wlan_sap_get_pre_cac_vdev_id(hdd_ctx->hHal, &session_id); if (QDF_IS_STATUS_ERROR(status)) { diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c index 8d6dc93e20c1..7db1a61b97ac 100644 --- a/core/hdd/src/wlan_hdd_nan_datapath.c +++ b/core/hdd/src/wlan_hdd_nan_datapath.c @@ -2054,7 +2054,7 @@ int wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy, } #ifndef WLAN_FEATURE_NAN_CONVERGENCE -static int update_ndi_state(struct hdd_adapter_s *adapter, uint32_t state) +static int update_ndi_state(struct hdd_adapter *adapter, uint32_t state) { struct nan_datapath_ctx *ndp_ctx = WLAN_HDD_GET_NDP_CTX_PTR(adapter); @@ -2062,7 +2062,7 @@ static int update_ndi_state(struct hdd_adapter_s *adapter, uint32_t state) return 0; } #else -static int update_ndi_state(struct hdd_adapter_s *adapter, uint32_t state) +static int update_ndi_state(struct hdd_adapter *adapter, uint32_t state) { return os_if_nan_set_ndi_state(adapter->hdd_vdev, state); } @@ -2074,7 +2074,7 @@ static int update_ndi_state(struct hdd_adapter_s *adapter, uint32_t state) * * Returns: 0 on success negative error code on error */ -int hdd_init_nan_data_mode(struct hdd_adapter_s *adapter) +int hdd_init_nan_data_mode(struct hdd_adapter *adapter) { struct net_device *wlan_dev = adapter->dev; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); diff --git a/core/hdd/src/wlan_hdd_nan_datapath.h b/core/hdd/src/wlan_hdd_nan_datapath.h index 56f49800e71d..081283e36bcf 100644 --- a/core/hdd/src/wlan_hdd_nan_datapath.h +++ b/core/hdd/src/wlan_hdd_nan_datapath.h @@ -29,7 +29,7 @@ struct hdd_context_s; struct hdd_tgt_cfg; struct hdd_config; -struct hdd_adapter_s; +struct hdd_adapter; struct wireless_dev; /* NAN Social channels */ @@ -212,12 +212,12 @@ struct nan_datapath_ctx { void hdd_ndp_print_ini_config(struct hdd_context_s *hdd_ctx); void hdd_nan_datapath_target_config(struct hdd_context_s *hdd_ctx, struct wma_tgt_cfg *cfg); -void hdd_ndp_event_handler(struct hdd_adapter_s *adapter, +void hdd_ndp_event_handler(struct hdd_adapter *adapter, tCsrRoamInfo *roam_info, uint32_t roam_id, eRoamCmdStatus roam_status, eCsrRoamResult roam_result); int wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy, struct wireless_dev *wdev, const void *data, int data_len); -int hdd_init_nan_data_mode(struct hdd_adapter_s *adapter); +int hdd_init_nan_data_mode(struct hdd_adapter *adapter); void hdd_ndp_session_end_handler(hdd_adapter_t *adapter); #else static inline void hdd_ndp_print_ini_config(struct hdd_context_s *hdd_ctx) @@ -227,7 +227,7 @@ static inline void hdd_nan_datapath_target_config(struct hdd_context_s *hdd_ctx, struct wma_tgt_cfg *cfg) { } -static inline void hdd_ndp_event_handler(struct hdd_adapter_s *adapter, +static inline void hdd_ndp_event_handler(struct hdd_adapter *adapter, tCsrRoamInfo *roam_info, uint32_t roam_id, eRoamCmdStatus roam_status, eCsrRoamResult roam_result) { @@ -237,7 +237,7 @@ static inline int wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy, { return 0; } -static inline int hdd_init_nan_data_mode(struct hdd_adapter_s *adapter) +static inline int hdd_init_nan_data_mode(struct hdd_adapter *adapter) { return 0; } diff --git a/core/hdd/src/wlan_hdd_tsf.c b/core/hdd/src/wlan_hdd_tsf.c index edb8a7557e1b..60a06174e0f8 100644 --- a/core/hdd/src/wlan_hdd_tsf.c +++ b/core/hdd/src/wlan_hdd_tsf.c @@ -126,13 +126,13 @@ static bool hdd_tsf_is_initialized(hdd_adapter_t *adapter) * Return: TSF_RETURN on Success, TSF_RESET_GPIO_FAIL on failure */ #ifdef QCA_WIFI_3_0 -static int hdd_tsf_reset_gpio(struct hdd_adapter_s *adapter) +static int hdd_tsf_reset_gpio(struct hdd_adapter *adapter) { /* No GPIO Host timer sync for integrated WIFI Device */ return TSF_RETURN; } #else -static int hdd_tsf_reset_gpio(struct hdd_adapter_s *adapter) +static int hdd_tsf_reset_gpio(struct hdd_adapter *adapter) { int ret; @@ -1053,7 +1053,7 @@ int hdd_indicate_tsf(hdd_adapter_t *adapter, uint32_t *buf, int len) int hdd_get_tsf_cb(void *pcb_cxt, struct stsf *ptsf) { struct hdd_context_s *hddctx; - struct hdd_adapter_s *adapter; + struct hdd_adapter *adapter; int status; if (pcb_cxt == NULL || ptsf == NULL) {