From b031fa6e0e6f42f7594bfa85fbae16a7287110aa Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 15 Feb 2018 14:30:05 -0800 Subject: [PATCH] qcacmn: Consistently use policy_mgr_dual_mac_config Remove duplicate structs wmi_dual_mac_config and sir_dual_mac_config and use policy_mgr_dual_mac_config. Change-Id: I6da6539f519ec46ee274ba3f3ae042e5fd9c25d2 CRs-Fixed: 2191031 --- inc/wlan_policy_mgr_public_struct.h | 5 ++++- src/wlan_policy_mgr_get_set_utils.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/inc/wlan_policy_mgr_public_struct.h b/inc/wlan_policy_mgr_public_struct.h index c45f3e63f08d..19ac08d1ebd4 100644 --- a/inc/wlan_policy_mgr_public_struct.h +++ b/inc/wlan_policy_mgr_public_struct.h @@ -788,6 +788,9 @@ enum set_hw_mode_status { SET_HW_MODE_STATUS_ECOEX, }; +typedef void (*dual_mac_cb)(enum set_hw_mode_status status, + uint32_t scan_config, + uint32_t fw_mode_config); /** * enum policy_mgr_hw_mode_change - identify the HW mode switching to. * @@ -895,7 +898,7 @@ struct policy_mgr_vdev_mac_map { struct policy_mgr_dual_mac_config { uint32_t scan_config; uint32_t fw_mode_config; - void *set_dual_mac_cb; + dual_mac_cb set_dual_mac_cb; }; /** diff --git a/src/wlan_policy_mgr_get_set_utils.c b/src/wlan_policy_mgr_get_set_utils.c index 9b86fdc7c343..2a7430127d1b 100644 --- a/src/wlan_policy_mgr_get_set_utils.c +++ b/src/wlan_policy_mgr_get_set_utils.c @@ -884,7 +884,7 @@ void policy_mgr_soc_set_dual_mac_cfg_cb(enum set_hw_mode_status status, uint32_t fw_mode_config) { policy_mgr_debug("Status:%d for scan_config:%x fw_mode_config:%x", - status, scan_config, fw_mode_config); + status, scan_config, fw_mode_config); } void policy_mgr_set_dual_mac_scan_config(struct wlan_objmgr_psoc *psoc, @@ -930,7 +930,7 @@ void policy_mgr_set_dual_mac_scan_config(struct wlan_objmgr_psoc *psoc, return; } - cfg.set_dual_mac_cb = (void *)policy_mgr_soc_set_dual_mac_cfg_cb; + cfg.set_dual_mac_cb = policy_mgr_soc_set_dual_mac_cfg_cb; policy_mgr_debug("scan_config:%x fw_mode_config:%x", cfg.scan_config, cfg.fw_mode_config); @@ -977,7 +977,7 @@ void policy_mgr_set_dual_mac_fw_mode_config(struct wlan_objmgr_psoc *psoc, return; } - cfg.set_dual_mac_cb = (void *)policy_mgr_soc_set_dual_mac_cfg_cb; + cfg.set_dual_mac_cb = policy_mgr_soc_set_dual_mac_cfg_cb; policy_mgr_debug("scan_config:%x fw_mode_config:%x", cfg.scan_config, cfg.fw_mode_config);