Browse Source

qcacmn: Fix type for wlan_serialization_cmd_callback

Fix the type for nan_serialized_cb and remove unnecessary
type casts from other callbacks.

Change-Id: Ie4e45f5a7e9fc17eb1c45fa18160e3bbd47151fe
CRs-Fixed: 2402989
Santosh Anbu 6 years ago
parent
commit
73f3f09abf

+ 5 - 2
umac/cmn_services/serialization/inc/wlan_serialization_api.h

@@ -98,6 +98,8 @@ union wlan_serialization_rules_info {
 	struct wlan_serialization_scan_info scan_info;
 };
 
+struct wlan_serialization_command;
+
 /**
  * wlan_serialization_cmd_callback() - Callback registered by the component
  * @wlan_cmd: Command passed by the component for serialization
@@ -110,8 +112,9 @@ union wlan_serialization_rules_info {
  *
  * Return: QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE
  */
-typedef QDF_STATUS (*wlan_serialization_cmd_callback)(void *wlan_cmd,
-				 enum wlan_serialization_cb_reason reason);
+typedef QDF_STATUS
+(*wlan_serialization_cmd_callback)(struct wlan_serialization_command *wlan_cmd,
+				   enum wlan_serialization_cb_reason reason);
 
 /**
  * wlan_serialization_comp_info_cb() - callback to fill the rules information

+ 2 - 2
umac/cmn_services/serialization/src/wlan_serialization_utf.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-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
@@ -59,7 +59,7 @@ wlan_ser_utf_add_cmd(struct wlan_serialization_command *cmd)
 
 	cmd->cmd_timeout_duration = WLAN_SER_UTF_TEST_CMD_TIMEOUT_MS;
 	cmd->source = WLAN_UMAC_COMP_SERIALIZATION;
-	cmd->cmd_cb = (wlan_serialization_cmd_callback)wlan_ser_utf_cb;
+	cmd->cmd_cb = wlan_ser_utf_cb;
 
 	status = wlan_serialization_request(cmd);
 	ser_debug("ADD : cmd_type:%d %9s %s status: %s",

+ 1 - 2
umac/scan/core/src/wlan_scan_manager.c

@@ -999,8 +999,7 @@ scm_scan_start_req(struct scheduler_msg *msg)
 
 	cmd.cmd_type = WLAN_SER_CMD_SCAN;
 	cmd.cmd_id = req->scan_req.scan_id;
-	cmd.cmd_cb = (wlan_serialization_cmd_callback)
-		scm_scan_serialize_callback;
+	cmd.cmd_cb = scm_scan_serialize_callback;
 	cmd.umac_cmd = req;
 	cmd.source = WLAN_UMAC_COMP_SCAN;
 	cmd.is_high_priority = false;