Skip to contentSkip to conversation

iwlwifi: mvm: Move static keyword to the front of declarations

PATCH In review Krzysztof Wilczynski 2 participants 3 messages Aug 31, 2019 – Sep 2, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iwlwifi: mvm: Move static keyword to the front of declarations

Move the static keyword to the front of declarations of he_if_types_ext_capa_sta and he_iftypes_ext_capa, and resolve the following compiler warnings that can be seen when building with warnings enabled (W=1):

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c:427:1: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c:434:1: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

---
Related: https://lore.kernel.org/r/[email protected]

 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +2 -2
index d6499763f0dd..937a843fed56 100644
@@ -424,14 +424,14 @@ int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm)
 	return ret;
 }
 
-const static u8 he_if_types_ext_capa_sta[] = {
+static const u8 he_if_types_ext_capa_sta[] = {
 	 [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,
 	 [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,
 	 [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,
 	 [9] = WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT,
 };
 
-const static struct wiphy_iftype_ext_capab he_iftypes_ext_capa[] = {
+static const struct wiphy_iftype_ext_capab he_iftypes_ext_capa[] = {
 	{
 		.iftype = NL80211_IFTYPE_STATION,
 		.extended_capabilities = he_if_types_ext_capa_sta,
Signature · 1 line
2.22.1
#1 lore raw
Quoted 29 lines · Krzysztof Wilczynski

Move the static keyword to the front of declarations of he_if_types_ext_capa_sta and he_iftypes_ext_capa, and resolve the following compiler warnings that can be seen when building with warnings enabled (W=1):

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c:427:1: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c:434:1: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

---
Related: https://lore.kernel.org/r/[email protected]

 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +1 -1
index d6499763f0dd..937a843fed56 100644
@@ -424,14 +424,14 @@ int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm)
 	return ret;
 }
 
-const static u8 he_if_types_ext_capa_sta[] = {
+static const u8 he_if_types_ext_capa_sta[] = {
 	 [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm) · line 437

Quoted 10 lines
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +1 -1
 	 [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,
 	 [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,
 	 [9] = WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT,
 };
 
-const static struct wiphy_iftype_ext_capab he_iftypes_ext_capa[] = {
+static const struct wiphy_iftype_ext_capab he_iftypes_ext_capa[] = {
 	{
 		.iftype = NL80211_IFTYPE_STATION,
 		.extended_capabilities = he_if_types_ext_capa_sta,

Thanks for your patch! Though we already have this change in our internal tree (submitted by YueHaibing) and it will reach the mainline soon.

--
Cheers,
Luca.

#2 lore raw

Hi Luca,

[...]

Quoted 3 lines

Thanks for your patch! Though we already have this change in our internal tree (submitted by YueHaibing) and it will reach the mainline soon.

Thank you for letting me know. I am glad it's fixed. :)

Krzysztof