diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h
index 595a9aa172..2068305220 100644
--- a/wmi/inc/wmi_unified_api.h
+++ b/wmi/inc/wmi_unified_api.h
@@ -2024,7 +2024,14 @@ QDF_STATUS
 wmi_unified_init_cmd_send(wmi_unified_t wmi_handle,
 			  struct wmi_init_cmd_param *param);
 
-bool wmi_service_enabled(void *wmi_hdl, uint32_t service_id);
+/**
+ * wmi_service_enabled() - Check if service enabled
+ * @wmi_handle: wmi handle
+ * @service_id: service identifier
+ *
+ * Return: 1 enabled, 0 disabled
+ */
+bool wmi_service_enabled(wmi_unified_t wmi_handle, uint32_t service_id);
 
 /**
  * wmi_save_service_bitmap() - save service bitmap
@@ -3207,13 +3214,13 @@ wmi_extract_offload_bcn_tx_status_evt(wmi_unified_t wmi_handle, void *evt_buf,
 				      uint32_t *vdev_id, uint32_t *tx_status);
 
 /* wmi_get_ch_width_from_phy_mode() - convert phy mode to channel width
- * @wmi_hdl: wmi handle
+ * @wmi_handle: wmi handle
  * @phymode: phy mode
  *
  * Return: wmi channel width
  */
-wmi_host_channel_width wmi_get_ch_width_from_phy_mode(void *wmi_hdl,
-					WMI_HOST_WLAN_PHY_MODE phymode);
+wmi_host_channel_width wmi_get_ch_width_from_phy_mode(
+	wmi_unified_t wmi_handle, WMI_HOST_WLAN_PHY_MODE phymode);
 
 #ifdef QCA_SUPPORT_CP_STATS
 /**
@@ -3232,7 +3239,7 @@ QDF_STATUS wmi_extract_cca_stats(wmi_unified_t wmi_handle, void *evt_buf,
 #if defined(WLAN_DFS_PARTIAL_OFFLOAD) && defined(HOST_DFS_SPOOF_TEST)
 /**
  * wmi_unified_dfs_send_avg_params_cmd() - send average radar parameters cmd.
- * @wmi_hdl: wmi handle
+ * @wmi_handle: wmi handle
  * @params: radar found params
  *
  * This function passes the average radar parameters to fw
@@ -3240,12 +3247,12 @@ QDF_STATUS wmi_extract_cca_stats(wmi_unified_t wmi_handle, void *evt_buf,
  * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
  */
 QDF_STATUS
-wmi_unified_dfs_send_avg_params_cmd(void *wmi_hdl,
+wmi_unified_dfs_send_avg_params_cmd(wmi_unified_t wmi_handle,
 				    struct dfs_radar_found_params *params);
 
 /**
  * wmi_extract_dfs_status_from_fw() - extract host dfs status from fw.
- * @wmi_hdl: wmi handle
+ * @wmi_handle: wmi handle
  * @evt_buf: pointer to event buffer
  * @dfs_status_check: pointer to the host dfs status
  *
@@ -3253,46 +3260,47 @@ wmi_unified_dfs_send_avg_params_cmd(void *wmi_hdl,
  *
  * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
  */
-QDF_STATUS wmi_extract_dfs_status_from_fw(void *wmi_hdl, void *evt_buf,
+QDF_STATUS wmi_extract_dfs_status_from_fw(wmi_unified_t wmi_handle,
+					  void *evt_buf,
 					  uint32_t  *dfs_status_check);
 #endif
 #ifdef OL_ATH_SMART_LOGGING
 /**
  * wmi_unified_send_smart_logging_enable_cmd() - send smart logging enable cmd
- * @wmi_hdl: wmi handle
- * @params: enable/disable
+ * @wmi_handle: wmi handle
+ * @param: enable/disable
  *
  * This function enables/disable the smart logging feature
  *
  * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
  */
-QDF_STATUS wmi_unified_send_smart_logging_enable_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_send_smart_logging_enable_cmd(wmi_unified_t wmi_handle,
 						     uint32_t param);
 
 /**
  * wmi_unified_send_smart_logging_fatal_cmd() - send smart logging fatal cmd
- * @wmi_hdl: wmi handle
+ * @wmi_handle: wmi handle
  * @param:  Fatal event
  *
  * This function sends the smart log fatal events to the FW
  *
  * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
  */
-QDF_STATUS wmi_unified_send_smart_logging_fatal_cmd
-					(void *wmi_hdl,
-					struct wmi_debug_fatal_events *param);
+QDF_STATUS
+wmi_unified_send_smart_logging_fatal_cmd(wmi_unified_t wmi_handle,
+					 struct wmi_debug_fatal_events *param);
 
 /**
  * wmi_extract_smartlog_ev() - extract smartlog event info from event
  * @wmi_handle: wmi handle
- * @param evt_buf: pointer to event buffer
- * @param ev: Pointer to hold fatal events
+ * @evt_buf: pointer to event buffer
+ * @ev: Pointer to hold fatal events
  *
  * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
  */
-QDF_STATUS wmi_extract_smartlog_ev
-				(void *wmi_hdl, void *evt_buf,
-				struct wmi_debug_fatal_events *ev);
+QDF_STATUS
+wmi_extract_smartlog_ev(wmi_unified_t wmi_handle, void *evt_buf,
+			struct wmi_debug_fatal_events *ev);
 
 #endif /* OL_ATH_SMART_LOGGING */
 
@@ -3314,16 +3322,15 @@ void wmi_process_fw_event_worker_thread_ctx(struct wmi_unified *wmi_handle,
  * wmi_extract_ctl_failsafe_check_ev_param() - extract ctl failsafe
  * status from event
  * @wmi_handle: wmi handle
- * @param evt_buf: pointer to event buffer
- * @param ev: Pointer to hold ctl status
+ * @evt_buf: pointer to event buffer
+ * @ev: Pointer to hold ctl status
  *
  * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
  */
-QDF_STATUS
-wmi_extract_ctl_failsafe_check_ev_param(void *wmi_hdl,
-					void *evt_buf,
-					struct wmi_host_pdev_ctl_failsafe_event
-					*param);
+QDF_STATUS wmi_extract_ctl_failsafe_check_ev_param(
+		wmi_unified_t wmi_handle,
+		void *evt_buf,
+		struct wmi_host_pdev_ctl_failsafe_event *param);
 
 #ifdef OBSS_PD
 /**
@@ -3333,7 +3340,8 @@ wmi_extract_ctl_failsafe_check_ev_param(void *wmi_hdl,
  *
  * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
  */
-QDF_STATUS wmi_unified_send_obss_spatial_reuse_set_cmd(void *wmi_handle,
+QDF_STATUS wmi_unified_send_obss_spatial_reuse_set_cmd(
+	wmi_unified_t wmi_handle,
 	struct wmi_host_obss_spatial_reuse_set_param *obss_spatial_reuse_param);
 
 /**
@@ -3343,7 +3351,8 @@ QDF_STATUS wmi_unified_send_obss_spatial_reuse_set_cmd(void *wmi_handle,
  *
  * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
  */
-QDF_STATUS wmi_unified_send_obss_spatial_reuse_set_def_thresh_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_send_obss_spatial_reuse_set_def_thresh_cmd(
+	wmi_unified_t wmi_handle,
 	struct wmi_host_obss_spatial_reuse_set_def_thresh *thresh);
 
 #endif /* OBSS_PD */
@@ -3352,20 +3361,20 @@ QDF_STATUS wmi_unified_send_obss_spatial_reuse_set_def_thresh_cmd(void *wmi_hdl,
  * wmi_convert_pdev_id_host_to_target() - Convert pdev_id from host to target
  * defines. For legacy there is not conversion required. Just return pdev_id as
  * it is.
- * @wmi_hdl: wmi handle
+ * @wmi_handle: wmi handle
  * @host_pdev_id: host pdev_id to be converted.
  * @target_pdev_id: Output target pdev id.
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS wmi_convert_pdev_id_host_to_target(void *wmi_hdl,
+QDF_STATUS wmi_convert_pdev_id_host_to_target(wmi_unified_t wmi_handle,
 					      uint32_t host_pdev_id,
 					      uint32_t *target_pdev_id);
 
 /**
  * wmi_unified_send_bss_color_change_enable_cmd() - WMI function to send bss
  *  color change enable to FW.
- * @wmi_hdl: wmi handle
+ * @wmi_handle: wmi handle
  * @vdev_id: vdev ID
  * @enable: enable or disable color change handeling within firmware
  *
@@ -3374,27 +3383,29 @@ QDF_STATUS wmi_convert_pdev_id_host_to_target(void *wmi_hdl,
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS wmi_unified_send_bss_color_change_enable_cmd(void *wmi_hdl,
-							uint32_t vdev_id,
-							bool enable);
+QDF_STATUS
+wmi_unified_send_bss_color_change_enable_cmd(wmi_unified_t wmi_handle,
+					     uint32_t vdev_id,
+					     bool enable);
 
 /**
  * wmi_unified_send_obss_color_collision_cfg_cmd() - WMI function to send bss
  *  color collision detection configuration to FW.
- * @wmi_hdl: wmi handle
+ * @wmi_handle: wmi handle
  * @cfg: obss color collision detection configuration
  *
  * Send WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID parameters to fw.
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS wmi_unified_send_obss_color_collision_cfg_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_send_obss_color_collision_cfg_cmd(
+		wmi_unified_t wmi_handle,
 		struct wmi_obss_color_collision_cfg_param *cfg);
 
 /**
  * wmi_unified_extract_obss_color_collision_info() - WMI function to extract
  *  obss color collision info from FW.
- * @wmi_hdl: wmi handle
+ * @wmi_handle: wmi handle
  * @data: event data from firmware
  * @info: Pointer to hold bss color collision info
  *
@@ -3402,7 +3413,8 @@ QDF_STATUS wmi_unified_send_obss_color_collision_cfg_cmd(void *wmi_hdl,
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS wmi_unified_extract_obss_color_collision_info(void *wmi_hdl,
+QDF_STATUS wmi_unified_extract_obss_color_collision_info(
+		wmi_unified_t wmi_handle,
 		uint8_t *data, struct wmi_obss_color_collision_info *info);
 
 #ifdef CRYPTO_SET_KEY_CONVERGED
@@ -3454,25 +3466,25 @@ wmi_unified_send_idle_trigger_monitor(wmi_unified_t wmi_handle, uint8_t val);
 /**
  * wmi_unified_send_peer_cfr_capture_cmd() - WMI function to start CFR capture
  * for a peer
- * @wmi_hdl: WMI handle
+ * @wmi_handle: WMI handle
  * @param: configuration params for capture
  *
  * Return: QDF_STATUS_SUCCESS if success, else returns proper error code.
  */
 QDF_STATUS
-wmi_unified_send_peer_cfr_capture_cmd(void *wmi_hdl,
+wmi_unified_send_peer_cfr_capture_cmd(wmi_unified_t wmi_handle,
 				      struct peer_cfr_params *param);
 /**
  * wmi_extract_cfr_peer_tx_event_param() - WMI function to extract cfr tx event
  * for a peer
- * @wmi_hdl: WMI handle
+ * @wmi_handle: WMI handle
  * @evt_buf: Buffer holding event data
  * @peer_tx_event: pointer to hold tx event data
  *
  * Return: QDF_STATUS_SUCCESS if success, else returns proper error code.
  */
 QDF_STATUS
-wmi_extract_cfr_peer_tx_event_param(void *wmi_hdl, void *evt_buf,
+wmi_extract_cfr_peer_tx_event_param(wmi_unified_t wmi_handle, void *evt_buf,
 				    wmi_cfr_peer_tx_event_param *peer_tx_event);
 
 #endif /* WLAN_CFR_ENABLE */
diff --git a/wmi/inc/wmi_unified_bcn_api.h b/wmi/inc/wmi_unified_bcn_api.h
index 1b5e25e5d3..52cc48722f 100644
--- a/wmi/inc/wmi_unified_bcn_api.h
+++ b/wmi/inc/wmi_unified_bcn_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -30,14 +30,14 @@
 
 /**
  * wmi_unified_bcn_buf_ll_cmd() - prepare and send beacon buffer to fw for LL
- * @wmi_hdl: wmi handle
+ * @wmi_handle: wmi handle
  * @param: bcn ll cmd parameter
  *
  * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
  */
 
 QDF_STATUS
-wmi_unified_bcn_buf_ll_cmd(void *wmi_hdl,
+wmi_unified_bcn_buf_ll_cmd(wmi_unified_t wmi_handle,
 			   wmi_bcn_send_from_host_cmd_fixed_param * param);
 #endif
 
diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h
index 38d0189478..5ff435c45b 100644
--- a/wmi/inc/wmi_unified_priv.h
+++ b/wmi/inc/wmi_unified_priv.h
@@ -1945,7 +1945,7 @@ QDF_STATUS (*extract_dfs_status_from_fw)(wmi_unified_t wmi_handle,
 #endif
 
 QDF_STATUS
-(*extract_cfr_peer_tx_event_param)(wmi_unified_t *wmi_handle, void *evt_buf,
+(*extract_cfr_peer_tx_event_param)(wmi_unified_t wmi_handle, void *evt_buf,
 				   wmi_cfr_peer_tx_event_param * peer_tx_event);
 
 #ifdef OBSS_PD
diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c
index 5356883d2c..064cdc7beb 100644
--- a/wmi/src/wmi_unified_api.c
+++ b/wmi/src/wmi_unified_api.c
@@ -1534,17 +1534,8 @@ wmi_check_and_update_fw_version(wmi_unified_t wmi_handle, void *evt_buf)
 	return QDF_STATUS_E_FAILURE;
 }
 
-/**
- * wmi_service_enabled() - Check if service enabled
- * @param wmi_handle: wmi handle
- * @param service_id: service identifier
- *
- * Return: 1 enabled, 0 disabled
- */
-bool wmi_service_enabled(void *wmi_hdl, uint32_t service_id)
+bool wmi_service_enabled(wmi_unified_t wmi_handle, uint32_t service_id)
 {
-	wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
-
 	if ((service_id < wmi_services_max) &&
 		(wmi_handle->services[service_id] != WMI_SERVICE_UNAVAILABLE)) {
 		if (wmi_handle->ops->is_service_enabled) {
@@ -1776,26 +1767,15 @@ wmi_send_reset_peer_mumimo_tx_count_cmd(wmi_unified_t wmi_handle,
 }
 
 /* Extract - APIs */
-/**
- * wmi_extract_ctl_failsafe_check_ev_param() - extract ctl data
- * from event
- * @wmi_handle: wmi handle
- * @param evt_buf: pointer to event buffer
- * @param param: Pointer to hold ctl data
- *
- * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
-QDF_STATUS
-wmi_extract_ctl_failsafe_check_ev_param(void *wmi_hdl,
-					void *evt_buf,
-					struct wmi_host_pdev_ctl_failsafe_event
-					*param)
-{
-	wmi_unified_t wmi = (wmi_unified_t)wmi_hdl;
 
-	if (wmi->ops->extract_ctl_failsafe_check_ev_param)
-		return wmi->ops->extract_ctl_failsafe_check_ev_param(
-			wmi, evt_buf, param);
+QDF_STATUS wmi_extract_ctl_failsafe_check_ev_param(
+		wmi_unified_t wmi_handle,
+		void *evt_buf,
+		struct wmi_host_pdev_ctl_failsafe_event *param)
+{
+	if (wmi_handle->ops->extract_ctl_failsafe_check_ev_param)
+		return wmi_handle->ops->extract_ctl_failsafe_check_ev_param(
+			wmi_handle, evt_buf, param);
 
 	return QDF_STATUS_E_FAILURE;
 }
@@ -2593,8 +2573,8 @@ QDF_STATUS wmi_extract_green_ap_egap_status_info(
 }
 #endif
 
-wmi_host_channel_width wmi_get_ch_width_from_phy_mode(void *wmi_hdl,
-					WMI_HOST_WLAN_PHY_MODE phymode)
+wmi_host_channel_width wmi_get_ch_width_from_phy_mode(
+	wmi_unified_t wmi_handle, WMI_HOST_WLAN_PHY_MODE phymode)
 {
 	/*
 	 * this API does translation between host only strcutres, hence
@@ -2621,11 +2601,9 @@ QDF_STATUS wmi_extract_cca_stats(wmi_unified_t wmi_handle, void *evt_buf,
 
 #if defined(WLAN_DFS_PARTIAL_OFFLOAD) && defined(HOST_DFS_SPOOF_TEST)
 QDF_STATUS
-wmi_unified_dfs_send_avg_params_cmd(void *wmi_hdl,
+wmi_unified_dfs_send_avg_params_cmd(wmi_unified_t wmi_handle,
 				    struct dfs_radar_found_params *params)
 {
-	wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
 	if (wmi_handle->ops->send_dfs_average_radar_params_cmd)
 		return wmi_handle->ops->send_dfs_average_radar_params_cmd(
 			wmi_handle, params);
@@ -2633,11 +2611,10 @@ wmi_unified_dfs_send_avg_params_cmd(void *wmi_hdl,
 	return QDF_STATUS_E_FAILURE;
 }
 
-QDF_STATUS wmi_extract_dfs_status_from_fw(void *wmi_hdl, void *evt_buf,
-					  uint32_t *dfs_status_check)
+QDF_STATUS
+wmi_extract_dfs_status_from_fw(wmi_unified_t wmi_handle, void *evt_buf,
+			       uint32_t *dfs_status_check)
 {
-	wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
 	if (wmi_handle->ops->extract_dfs_status_from_fw)
 		return wmi_handle->ops->extract_dfs_status_from_fw(wmi_handle,
 				evt_buf, dfs_status_check);
@@ -2647,11 +2624,9 @@ QDF_STATUS wmi_extract_dfs_status_from_fw(void *wmi_hdl, void *evt_buf,
 #endif
 
 #ifdef OL_ATH_SMART_LOGGING
-QDF_STATUS wmi_unified_send_smart_logging_enable_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_send_smart_logging_enable_cmd(wmi_unified_t wmi_handle,
 						     uint32_t param)
 {
-	wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
 	if (wmi_handle->ops->send_smart_logging_enable_cmd)
 		return wmi_handle->ops->send_smart_logging_enable_cmd(
 				wmi_handle,
@@ -2661,11 +2636,9 @@ QDF_STATUS wmi_unified_send_smart_logging_enable_cmd(void *wmi_hdl,
 }
 
 QDF_STATUS
-wmi_unified_send_smart_logging_fatal_cmd(void *wmi_hdl,
+wmi_unified_send_smart_logging_fatal_cmd(wmi_unified_t wmi_handle,
 					 struct wmi_debug_fatal_events *param)
 {
-	wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
 	if (wmi_handle->ops->send_smart_logging_fatal_cmd)
 		return wmi_handle->ops->send_smart_logging_fatal_cmd(wmi_handle,
 			param);
@@ -2673,14 +2646,13 @@ wmi_unified_send_smart_logging_fatal_cmd(void *wmi_hdl,
 	return QDF_STATUS_E_FAILURE;
 }
 
-QDF_STATUS wmi_extract_smartlog_ev(void *wmi_hdl,
+QDF_STATUS wmi_extract_smartlog_ev(wmi_unified_t wmi_handle,
 				   void *evt_buf,
 				   struct wmi_debug_fatal_events *ev)
 {
-	wmi_unified_t wmi = (wmi_unified_t)wmi_hdl;
-
-	if (wmi->ops->extract_smartlog_event)
-		return wmi->ops->extract_smartlog_event(wmi, evt_buf, ev);
+	if (wmi_handle->ops->extract_smartlog_event)
+		return wmi_handle->ops->extract_smartlog_event(
+				wmi_handle, evt_buf, ev);
 
 	return QDF_STATUS_E_FAILURE;
 }
@@ -2786,40 +2758,34 @@ wmi_extract_offload_bcn_tx_status_evt(wmi_unified_t wmi_handle, void *evt_buf,
 }
 
 #ifdef OBSS_PD
-QDF_STATUS
-wmi_unified_send_obss_spatial_reuse_set_cmd(void *wmi_hdl,
-				    struct wmi_host_obss_spatial_reuse_set_param
-				    *obss_spatial_reuse_param)
+QDF_STATUS wmi_unified_send_obss_spatial_reuse_set_cmd(
+	wmi_unified_t wmi_handle,
+	struct wmi_host_obss_spatial_reuse_set_param *obss_spatial_reuse_param)
 {
-	wmi_unified_t wmi = (wmi_unified_t)wmi_hdl;
-
-	if (wmi->ops->send_obss_spatial_reuse_set)
-		return wmi->ops->send_obss_spatial_reuse_set(wmi,
+	if (wmi_handle->ops->send_obss_spatial_reuse_set)
+		return wmi_handle->ops->send_obss_spatial_reuse_set(wmi_handle,
 				obss_spatial_reuse_param);
 
 	return QDF_STATUS_E_FAILURE;
 }
 
 QDF_STATUS
-wmi_unified_send_obss_spatial_reuse_set_def_thresh_cmd(void *wmi_hdl,
+wmi_unified_send_obss_spatial_reuse_set_def_thresh_cmd(
+		wmi_unified_t wmi_handle,
 		struct wmi_host_obss_spatial_reuse_set_def_thresh *thresh)
 {
-	wmi_unified_t wmi = (wmi_unified_t)wmi_hdl;
-
-	if (wmi->ops->send_obss_spatial_reuse_set_def_thresh)
-		return wmi->ops->send_obss_spatial_reuse_set_def_thresh(wmi,
-									thresh);
+	if (wmi_handle->ops->send_obss_spatial_reuse_set_def_thresh)
+		return wmi_handle->ops->send_obss_spatial_reuse_set_def_thresh(
+						wmi_handle, thresh);
 
 	return QDF_STATUS_E_FAILURE;
 }
 #endif
 
-QDF_STATUS wmi_convert_pdev_id_host_to_target(void *wmi_hdl,
+QDF_STATUS wmi_convert_pdev_id_host_to_target(wmi_unified_t wmi_handle,
 					      uint32_t host_pdev_id,
 					      uint32_t *target_pdev_id)
 {
-	wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
 	if (wmi_handle->ops->convert_pdev_id_host_to_target) {
 		*target_pdev_id =
 			wmi_handle->ops->convert_pdev_id_host_to_target(
@@ -2830,12 +2796,11 @@ QDF_STATUS wmi_convert_pdev_id_host_to_target(void *wmi_hdl,
 	return QDF_STATUS_E_FAILURE;
 }
 
-QDF_STATUS wmi_unified_send_bss_color_change_enable_cmd(void *wmi_hdl,
-							uint32_t vdev_id,
-							bool enable)
+QDF_STATUS
+wmi_unified_send_bss_color_change_enable_cmd(wmi_unified_t wmi_handle,
+					     uint32_t vdev_id,
+					     bool enable)
 {
-	wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
 	if (wmi_handle->ops->send_bss_color_change_enable_cmd)
 		return wmi_handle->ops->send_bss_color_change_enable_cmd(
 				wmi_handle, vdev_id, enable);
@@ -2843,11 +2808,10 @@ QDF_STATUS wmi_unified_send_bss_color_change_enable_cmd(void *wmi_hdl,
 	return QDF_STATUS_E_FAILURE;
 }
 
-QDF_STATUS wmi_unified_send_obss_color_collision_cfg_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_send_obss_color_collision_cfg_cmd(
+		wmi_unified_t wmi_handle,
 		struct wmi_obss_color_collision_cfg_param *cfg)
 {
-	wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
 	if (wmi_handle->ops->send_obss_color_collision_cfg_cmd)
 		return wmi_handle->ops->send_obss_color_collision_cfg_cmd(
 				wmi_handle, cfg);
@@ -2855,11 +2819,10 @@ QDF_STATUS wmi_unified_send_obss_color_collision_cfg_cmd(void *wmi_hdl,
 	return QDF_STATUS_E_FAILURE;
 }
 
-QDF_STATUS wmi_unified_extract_obss_color_collision_info(void *wmi_hdl,
+QDF_STATUS wmi_unified_extract_obss_color_collision_info(
+		wmi_unified_t wmi_handle,
 		uint8_t *data, struct wmi_obss_color_collision_info *info)
 {
-	wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
 	if (wmi_handle->ops->extract_obss_color_collision_info)
 		return wmi_handle->ops->extract_obss_color_collision_info(data,
 									  info);
@@ -2868,13 +2831,11 @@ QDF_STATUS wmi_unified_extract_obss_color_collision_info(void *wmi_hdl,
 }
 
 #ifdef WLAN_CFR_ENABLE
-QDF_STATUS wmi_unified_send_peer_cfr_capture_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_send_peer_cfr_capture_cmd(wmi_unified_t wmi_handle,
 						 struct peer_cfr_params *param)
 {
-	wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
 	if (wmi_handle->ops->send_peer_cfr_capture_cmd)
-		return wmi_handle->ops->send_peer_cfr_capture_cmd(wmi_hdl,
+		return wmi_handle->ops->send_peer_cfr_capture_cmd(wmi_handle,
 								  param);
 
 	return QDF_STATUS_E_FAILURE;
@@ -2884,15 +2845,14 @@ QDF_STATUS wmi_unified_send_peer_cfr_capture_cmd(void *wmi_hdl,
  * wmi_extract_cfr_peer_tx_event_param() - extract tx event params from event
  */
 QDF_STATUS
-wmi_extract_cfr_peer_tx_event_param(void *wmi_hdl, void *evt_buf,
+wmi_extract_cfr_peer_tx_event_param(wmi_unified_t wmi_handle, void *evt_buf,
 				    wmi_cfr_peer_tx_event_param *peer_tx_event)
 {
-	wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
 	if (wmi_handle->ops->extract_cfr_peer_tx_event_param)
-		return wmi_handle->ops->extract_cfr_peer_tx_event_param(wmi_hdl,
-									evt_buf,
-									peer_tx_event);
+		return wmi_handle->ops->extract_cfr_peer_tx_event_param(
+							wmi_handle,
+							evt_buf,
+							peer_tx_event);
 	return QDF_STATUS_E_FAILURE;
 }
 #endif /* WLAN_CFR_ENABLE */
diff --git a/wmi/src/wmi_unified_bcn_api.c b/wmi/src/wmi_unified_bcn_api.c
index b90ba270ed..4b56a5f5e3 100644
--- a/wmi/src/wmi_unified_bcn_api.c
+++ b/wmi/src/wmi_unified_bcn_api.c
@@ -1,6 +1,5 @@
-
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -22,20 +21,10 @@
 
 #include "wmi_unified_bcn_api.h"
 
-/**
- * wmi_unified_bcn_buf_ll_cmd() - prepare and send beacon buffer to fw for LL
- * @wmi_hdl: wmi handle
- * @param: bcn ll cmd parameter
- *
- * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
-
 QDF_STATUS
-wmi_unified_bcn_buf_ll_cmd(void *wmi_hdl,
+wmi_unified_bcn_buf_ll_cmd(wmi_unified_t wmi_handle,
 			   wmi_bcn_send_from_host_cmd_fixed_param *param)
 {
-	wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
 	if (wmi_handle->ops->send_bcn_buf_ll_cmd)
 		return wmi_handle->ops->send_bcn_buf_ll_cmd(wmi_handle,
 						param);
diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c
index f2bd4a6909..5a0ef87513 100644
--- a/wmi/src/wmi_unified_tlv.c
+++ b/wmi/src/wmi_unified_tlv.c
@@ -11552,7 +11552,7 @@ static void wmi_11ax_bss_color_attach_tlv(struct wmi_unified *wmi_handle)
  * Return QDF_STATUS_SUCCESS on success or proper error code.
  */
 static QDF_STATUS
-extract_cfr_peer_tx_event_param_tlv(wmi_unified_t *wmi_handle, void *evt_buf,
+extract_cfr_peer_tx_event_param_tlv(wmi_unified_t wmi_handle, void *evt_buf,
 				    wmi_cfr_peer_tx_event_param *peer_tx_event)
 {
 	WMI_PEER_CFR_CAPTURE_EVENTID_param_tlvs *param_buf;