Just to make lines shorter.

Signed-off-by: Kalle Valo <kv...@qca.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/wmi.h |   56 +++++++++++++++++----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/wmi.h 
b/drivers/net/wireless/ath/ath10k/wmi.h
index 9b15369..053d294 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -218,7 +218,7 @@ enum wmi_cmd_group {
        WMI_GRP_MISC,
 };
 
-#define WMI_CMD_GRP_START_ID(grp_id) (((grp_id) << 12) | 0x1)
+#define WMI_CMD_GRP(grp_id) (((grp_id) << 12) | 0x1)
 #define WMI_EVT_GRP_START_ID(grp_id) (((grp_id) << 12) | 0x1)
 
 /* Command IDs and commande events. */
@@ -226,13 +226,13 @@ enum wmi_cmd_id {
        WMI_INIT_CMDID = 0x1,
 
        /* Scan specific commands */
-       WMI_START_SCAN_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_SCAN),
+       WMI_START_SCAN_CMDID = WMI_CMD_GRP(WMI_GRP_SCAN),
        WMI_STOP_SCAN_CMDID,
        WMI_SCAN_CHAN_LIST_CMDID,
        WMI_SCAN_SCH_PRIO_TBL_CMDID,
 
        /* PDEV (physical device) specific commands */
-       WMI_PDEV_SET_REGDOMAIN_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_PDEV),
+       WMI_PDEV_SET_REGDOMAIN_CMDID = WMI_CMD_GRP(WMI_GRP_PDEV),
        WMI_PDEV_SET_CHANNEL_CMDID,
        WMI_PDEV_SET_PARAM_CMDID,
        WMI_PDEV_PKTLOG_ENABLE_CMDID,
@@ -246,7 +246,7 @@ enum wmi_cmd_id {
        WMI_PDEV_GET_TPC_CONFIG_CMDID,
 
        /* VDEV (virtual device) specific commands */
-       WMI_VDEV_CREATE_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_VDEV),
+       WMI_VDEV_CREATE_CMDID = WMI_CMD_GRP(WMI_GRP_VDEV),
        WMI_VDEV_DELETE_CMDID,
        WMI_VDEV_START_REQUEST_CMDID,
        WMI_VDEV_RESTART_REQUEST_CMDID,
@@ -259,7 +259,7 @@ enum wmi_cmd_id {
        WMI_VDEV_INSTALL_KEY_CMDID,
 
        /* peer specific commands */
-       WMI_PEER_CREATE_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_PEER),
+       WMI_PEER_CREATE_CMDID = WMI_CMD_GRP(WMI_GRP_PEER),
        WMI_PEER_DELETE_CMDID,
        WMI_PEER_FLUSH_TIDS_CMDID,
        WMI_PEER_SET_PARAM_CMDID,
@@ -269,7 +269,7 @@ enum wmi_cmd_id {
        WMI_PEER_MCAST_GROUP_CMDID,
 
        /* beacon/management specific commands */
-       WMI_BCN_TX_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_MGMT),
+       WMI_BCN_TX_CMDID = WMI_CMD_GRP(WMI_GRP_MGMT),
        WMI_PDEV_SEND_BCN_CMDID,
        WMI_BCN_TMPL_CMDID,
        WMI_BCN_FILTER_RX_CMDID,
@@ -278,7 +278,7 @@ enum wmi_cmd_id {
        WMI_PRB_TMPL_CMDID,
 
        /* commands to directly control BA negotiation directly from host. */
-       WMI_ADDBA_CLEAR_RESP_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_BA_NEG),
+       WMI_ADDBA_CLEAR_RESP_CMDID = WMI_CMD_GRP(WMI_GRP_BA_NEG),
        WMI_ADDBA_SEND_CMDID,
        WMI_ADDBA_STATUS_CMDID,
        WMI_DELBA_SEND_CMDID,
@@ -286,96 +286,96 @@ enum wmi_cmd_id {
        WMI_SEND_SINGLEAMSDU_CMDID,
 
        /* Station power save specific config */
-       WMI_STA_POWERSAVE_MODE_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_STA_PS),
+       WMI_STA_POWERSAVE_MODE_CMDID = WMI_CMD_GRP(WMI_GRP_STA_PS),
        WMI_STA_POWERSAVE_PARAM_CMDID,
        WMI_STA_MIMO_PS_MODE_CMDID,
 
        /** DFS-specific commands */
-       WMI_PDEV_DFS_ENABLE_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_DFS),
+       WMI_PDEV_DFS_ENABLE_CMDID = WMI_CMD_GRP(WMI_GRP_DFS),
        WMI_PDEV_DFS_DISABLE_CMDID,
 
        /* Roaming specific  commands */
-       WMI_ROAM_SCAN_MODE = WMI_CMD_GRP_START_ID(WMI_GRP_ROAM),
+       WMI_ROAM_SCAN_MODE = WMI_CMD_GRP(WMI_GRP_ROAM),
        WMI_ROAM_SCAN_RSSI_THRESHOLD,
        WMI_ROAM_SCAN_PERIOD,
        WMI_ROAM_SCAN_RSSI_CHANGE_THRESHOLD,
        WMI_ROAM_AP_PROFILE,
 
        /* offload scan specific commands */
-       WMI_OFL_SCAN_ADD_AP_PROFILE = WMI_CMD_GRP_START_ID(WMI_GRP_OFL_SCAN),
+       WMI_OFL_SCAN_ADD_AP_PROFILE = WMI_CMD_GRP(WMI_GRP_OFL_SCAN),
        WMI_OFL_SCAN_REMOVE_AP_PROFILE,
        WMI_OFL_SCAN_PERIOD,
 
        /* P2P specific commands */
-       WMI_P2P_DEV_SET_DEVICE_INFO = WMI_CMD_GRP_START_ID(WMI_GRP_P2P),
+       WMI_P2P_DEV_SET_DEVICE_INFO = WMI_CMD_GRP(WMI_GRP_P2P),
        WMI_P2P_DEV_SET_DISCOVERABILITY,
        WMI_P2P_GO_SET_BEACON_IE,
        WMI_P2P_GO_SET_PROBE_RESP_IE,
        WMI_P2P_SET_VENDOR_IE_DATA_CMDID,
 
        /* AP power save specific config */
-       WMI_AP_PS_PEER_PARAM_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_AP_PS),
+       WMI_AP_PS_PEER_PARAM_CMDID = WMI_CMD_GRP(WMI_GRP_AP_PS),
        WMI_AP_PS_PEER_UAPSD_COEX_CMDID,
 
        /* Rate-control specific commands */
        WMI_PEER_RATE_RETRY_SCHED_CMDID =
-       WMI_CMD_GRP_START_ID(WMI_GRP_RATE_CTRL),
+       WMI_CMD_GRP(WMI_GRP_RATE_CTRL),
 
        /* WLAN Profiling commands. */
-       WMI_WLAN_PROFILE_TRIGGER_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_PROFILE),
+       WMI_WLAN_PROFILE_TRIGGER_CMDID = WMI_CMD_GRP(WMI_GRP_PROFILE),
        WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID,
        WMI_WLAN_PROFILE_GET_PROFILE_DATA_CMDID,
        WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID,
        WMI_WLAN_PROFILE_LIST_PROFILE_ID_CMDID,
 
        /* Suspend resume command Ids */
-       WMI_PDEV_SUSPEND_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_SUSPEND),
+       WMI_PDEV_SUSPEND_CMDID = WMI_CMD_GRP(WMI_GRP_SUSPEND),
        WMI_PDEV_RESUME_CMDID,
 
        /* Beacon filter commands */
-       WMI_ADD_BCN_FILTER_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_BCN_FILTER),
+       WMI_ADD_BCN_FILTER_CMDID = WMI_CMD_GRP(WMI_GRP_BCN_FILTER),
        WMI_RMV_BCN_FILTER_CMDID,
 
        /* WOW Specific WMI commands*/
-       WMI_WOW_ADD_WAKE_PATTERN_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_WOW),
+       WMI_WOW_ADD_WAKE_PATTERN_CMDID = WMI_CMD_GRP(WMI_GRP_WOW),
        WMI_WOW_DEL_WAKE_PATTERN_CMDID,
        WMI_WOW_ENABLE_DISABLE_WAKE_EVENT_CMDID,
        WMI_WOW_ENABLE_CMDID,
        WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID,
 
        /* RTT measurement related cmd */
-       WMI_RTT_MEASREQ_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_RTT),
+       WMI_RTT_MEASREQ_CMDID = WMI_CMD_GRP(WMI_GRP_RTT),
        WMI_RTT_TSF_CMDID,
 
        /* spectral scan commands */
-       WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID = 
WMI_CMD_GRP_START_ID(WMI_GRP_SPECTRAL),
+       WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID = WMI_CMD_GRP(WMI_GRP_SPECTRAL),
        WMI_VDEV_SPECTRAL_SCAN_ENABLE_CMDID,
 
        /* F/W stats */
-       WMI_REQUEST_STATS_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_STATS),
+       WMI_REQUEST_STATS_CMDID = WMI_CMD_GRP(WMI_GRP_STATS),
 
        /* ARP OFFLOAD REQUEST*/
-       WMI_SET_ARP_NS_OFFLOAD_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_ARP_NS_OFL),
+       WMI_SET_ARP_NS_OFFLOAD_CMDID = WMI_CMD_GRP(WMI_GRP_ARP_NS_OFL),
 
        /* NS offload confid*/
-       WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID = 
WMI_CMD_GRP_START_ID(WMI_GRP_NLO_OFL),
+       WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID = WMI_CMD_GRP(WMI_GRP_NLO_OFL),
 
        /* GTK offload Specific WMI commands*/
-       WMI_GTK_OFFLOAD_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_GTK_OFL),
+       WMI_GTK_OFFLOAD_CMDID = WMI_CMD_GRP(WMI_GRP_GTK_OFL),
 
        /* CSA offload Specific WMI commands*/
-       WMI_CSA_OFFLOAD_ENABLE_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_CSA_OFL),
+       WMI_CSA_OFFLOAD_ENABLE_CMDID = WMI_CMD_GRP(WMI_GRP_CSA_OFL),
        WMI_CSA_OFFLOAD_CHANSWITCH_CMDID,
 
        /* Chatter commands*/
-       WMI_CHATTER_SET_MODE_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_CHATTER),
+       WMI_CHATTER_SET_MODE_CMDID = WMI_CMD_GRP(WMI_GRP_CHATTER),
 
        /* addba specific commands */
-       WMI_PEER_TID_ADDBA_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_TID_ADDBA),
+       WMI_PEER_TID_ADDBA_CMDID = WMI_CMD_GRP(WMI_GRP_TID_ADDBA),
        WMI_PEER_TID_DELBA_CMDID,
 
        /* misc command group */
-       WMI_ECHO_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_MISC),
+       WMI_ECHO_CMDID = WMI_CMD_GRP(WMI_GRP_MISC),
        WMI_DBGLOG_CFG_CMDID,
        WMI_PDEV_QVIT_CMDID,
        WMI_PDEV_FTM_INTG_CMDID,

_______________________________________________
ath9k-devel mailing list
ath9k-devel@lists.ath9k.org
https://lists.ath9k.org/mailman/listinfo/ath9k-devel

Reply via email to