wcn36xx: Improve readability of wcn36xx_caps_name

Use macros to force strict ordering of the elements.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220328212912.283393-1-benni@stuerz.xyz

diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index 864d1547e6f83d8c3a79b40c1781ee1553829bdf..61c47f958e4afc8b2f1aee2f6d56d4b7dcd10164 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -192,70 +192,74 @@ static inline u8 get_sta_index(struct ieee80211_vif *vif,
               sta_priv->sta_index;
 }
 
+#define DEFINE(s) [s] = #s
+
 static const char * const wcn36xx_caps_names[] = {
-       "MCC",                          /* 0 */
-       "P2P",                          /* 1 */
-       "DOT11AC",                      /* 2 */
-       "SLM_SESSIONIZATION",           /* 3 */
-       "DOT11AC_OPMODE",               /* 4 */
-       "SAP32STA",                     /* 5 */
-       "TDLS",                         /* 6 */
-       "P2P_GO_NOA_DECOUPLE_INIT_SCAN",/* 7 */
-       "WLANACTIVE_OFFLOAD",           /* 8 */
-       "BEACON_OFFLOAD",               /* 9 */
-       "SCAN_OFFLOAD",                 /* 10 */
-       "ROAM_OFFLOAD",                 /* 11 */
-       "BCN_MISS_OFFLOAD",             /* 12 */
-       "STA_POWERSAVE",                /* 13 */
-       "STA_ADVANCED_PWRSAVE",         /* 14 */
-       "AP_UAPSD",                     /* 15 */
-       "AP_DFS",                       /* 16 */
-       "BLOCKACK",                     /* 17 */
-       "PHY_ERR",                      /* 18 */
-       "BCN_FILTER",                   /* 19 */
-       "RTT",                          /* 20 */
-       "RATECTRL",                     /* 21 */
-       "WOW",                          /* 22 */
-       "WLAN_ROAM_SCAN_OFFLOAD",       /* 23 */
-       "SPECULATIVE_PS_POLL",          /* 24 */
-       "SCAN_SCH",                     /* 25 */
-       "IBSS_HEARTBEAT_OFFLOAD",       /* 26 */
-       "WLAN_SCAN_OFFLOAD",            /* 27 */
-       "WLAN_PERIODIC_TX_PTRN",        /* 28 */
-       "ADVANCE_TDLS",                 /* 29 */
-       "BATCH_SCAN",                   /* 30 */
-       "FW_IN_TX_PATH",                /* 31 */
-       "EXTENDED_NSOFFLOAD_SLOT",      /* 32 */
-       "CH_SWITCH_V1",                 /* 33 */
-       "HT40_OBSS_SCAN",               /* 34 */
-       "UPDATE_CHANNEL_LIST",          /* 35 */
-       "WLAN_MCADDR_FLT",              /* 36 */
-       "WLAN_CH144",                   /* 37 */
-       "NAN",                          /* 38 */
-       "TDLS_SCAN_COEXISTENCE",        /* 39 */
-       "LINK_LAYER_STATS_MEAS",        /* 40 */
-       "MU_MIMO",                      /* 41 */
-       "EXTENDED_SCAN",                /* 42 */
-       "DYNAMIC_WMM_PS",               /* 43 */
-       "MAC_SPOOFED_SCAN",             /* 44 */
-       "BMU_ERROR_GENERIC_RECOVERY",   /* 45 */
-       "DISA",                         /* 46 */
-       "FW_STATS",                     /* 47 */
-       "WPS_PRBRSP_TMPL",              /* 48 */
-       "BCN_IE_FLT_DELTA",             /* 49 */
-       "TDLS_OFF_CHANNEL",             /* 51 */
-       "RTT3",                         /* 52 */
-       "MGMT_FRAME_LOGGING",           /* 53 */
-       "ENHANCED_TXBD_COMPLETION",     /* 54 */
-       "LOGGING_ENHANCEMENT",          /* 55 */
-       "EXT_SCAN_ENHANCED",            /* 56 */
-       "MEMORY_DUMP_SUPPORTED",        /* 57 */
-       "PER_PKT_STATS_SUPPORTED",      /* 58 */
-       "EXT_LL_STAT",                  /* 60 */
-       "WIFI_CONFIG",                  /* 61 */
-       "ANTENNA_DIVERSITY_SELECTION",  /* 62 */
+       DEFINE(MCC),
+       DEFINE(P2P),
+       DEFINE(DOT11AC),
+       DEFINE(SLM_SESSIONIZATION),
+       DEFINE(DOT11AC_OPMODE),
+       DEFINE(SAP32STA),
+       DEFINE(TDLS),
+       DEFINE(P2P_GO_NOA_DECOUPLE_INIT_SCAN),
+       DEFINE(WLANACTIVE_OFFLOAD),
+       DEFINE(BEACON_OFFLOAD),
+       DEFINE(SCAN_OFFLOAD),
+       DEFINE(ROAM_OFFLOAD),
+       DEFINE(BCN_MISS_OFFLOAD),
+       DEFINE(STA_POWERSAVE),
+       DEFINE(STA_ADVANCED_PWRSAVE),
+       DEFINE(AP_UAPSD),
+       DEFINE(AP_DFS),
+       DEFINE(BLOCKACK),
+       DEFINE(PHY_ERR),
+       DEFINE(BCN_FILTER),
+       DEFINE(RTT),
+       DEFINE(RATECTRL),
+       DEFINE(WOW),
+       DEFINE(WLAN_ROAM_SCAN_OFFLOAD),
+       DEFINE(SPECULATIVE_PS_POLL),
+       DEFINE(SCAN_SCH),
+       DEFINE(IBSS_HEARTBEAT_OFFLOAD),
+       DEFINE(WLAN_SCAN_OFFLOAD),
+       DEFINE(WLAN_PERIODIC_TX_PTRN),
+       DEFINE(ADVANCE_TDLS),
+       DEFINE(BATCH_SCAN),
+       DEFINE(FW_IN_TX_PATH),
+       DEFINE(EXTENDED_NSOFFLOAD_SLOT),
+       DEFINE(CH_SWITCH_V1),
+       DEFINE(HT40_OBSS_SCAN),
+       DEFINE(UPDATE_CHANNEL_LIST),
+       DEFINE(WLAN_MCADDR_FLT),
+       DEFINE(WLAN_CH144),
+       DEFINE(NAN),
+       DEFINE(TDLS_SCAN_COEXISTENCE),
+       DEFINE(LINK_LAYER_STATS_MEAS),
+       DEFINE(MU_MIMO),
+       DEFINE(EXTENDED_SCAN),
+       DEFINE(DYNAMIC_WMM_PS),
+       DEFINE(MAC_SPOOFED_SCAN),
+       DEFINE(BMU_ERROR_GENERIC_RECOVERY),
+       DEFINE(DISA),
+       DEFINE(FW_STATS),
+       DEFINE(WPS_PRBRSP_TMPL),
+       DEFINE(BCN_IE_FLT_DELTA),
+       DEFINE(TDLS_OFF_CHANNEL),
+       DEFINE(RTT3),
+       DEFINE(MGMT_FRAME_LOGGING),
+       DEFINE(ENHANCED_TXBD_COMPLETION),
+       DEFINE(LOGGING_ENHANCEMENT),
+       DEFINE(EXT_SCAN_ENHANCED),
+       DEFINE(MEMORY_DUMP_SUPPORTED),
+       DEFINE(PER_PKT_STATS_SUPPORTED),
+       DEFINE(EXT_LL_STAT),
+       DEFINE(WIFI_CONFIG),
+       DEFINE(ANTENNA_DIVERSITY_SELECTION),
 };
 
+#undef DEFINE
+
 static const char *wcn36xx_get_cap_name(enum place_holder_in_cap_bitmap x)
 {
        if (x >= ARRAY_SIZE(wcn36xx_caps_names))