Browse Source

qcacld-3.0: Refine the CSR channel status APIs

Currently csr_get_channel_status() and csr_clear_channel_status() both
use void * for their p_mac parameter. Since this is not an opaque data
structure update the APIs the use the correct underlying data type.

Change-Id: I900e97cbdeced3bacc1f2da30f892a4d55648059
CRs-Fixed: 2281794
Jeff Johnson 6 years ago
parent
commit
1be200ae98
2 changed files with 17 additions and 20 deletions
  1. 5 5
      core/sme/inc/csr_api.h
  2. 12 15
      core/sme/src/csr/csr_util.c

+ 5 - 5
core/sme/inc/csr_api.h

@@ -1742,19 +1742,19 @@ void csr_packetdump_timer_stop(void);
 
 /**
  * csr_get_channel_status() - get chan info via channel number
- * @p_mac: Pointer to Global MAC structure
+ * @mac: Pointer to Global MAC structure
  * @channel_id: channel id
  *
  * Return: chan status info
  */
-struct lim_channel_status *csr_get_channel_status(void *p_mac,
-						  uint32_t channel_id);
+struct lim_channel_status *
+csr_get_channel_status(tpAniSirGlobal mac, uint32_t channel_id);
 
 /**
  * csr_clear_channel_status() - clear chan info
- * @p_mac: Pointer to Global MAC structure
+ * @mac: Pointer to Global MAC structure
  *
  * Return: none
  */
-void csr_clear_channel_status(void *p_mac);
+void csr_clear_channel_status(tpAniSirGlobal mac);
 #endif

+ 12 - 15
core/sme/src/csr/csr_util.c

@@ -6135,38 +6135,35 @@ uint16_t sme_chn_to_freq(uint8_t chanNum)
 	return 0;
 }
 
-struct lim_channel_status *csr_get_channel_status(
-	void *p_mac, uint32_t channel_id)
+struct lim_channel_status *
+csr_get_channel_status(tpAniSirGlobal mac, uint32_t channel_id)
 {
 	uint8_t i;
 	struct lim_scan_channel_status *channel_status;
-	tpAniSirGlobal mac_ptr = (tpAniSirGlobal)p_mac;
+	struct lim_channel_status *entry;
 
-	if (!mac_ptr->sap.acs_with_more_param)
+	if (!mac->sap.acs_with_more_param)
 		return NULL;
 
-	channel_status = (struct lim_scan_channel_status *)
-				&mac_ptr->lim.scan_channel_status;
+	channel_status = &mac->lim.scan_channel_status;
 	for (i = 0; i < channel_status->total_channel; i++) {
-		if (channel_status->channel_status_list[i].channel_id ==
-		    channel_id)
-			return &channel_status->channel_status_list[i];
+		entry = &channel_status->channel_status_list[i];
+		if (entry->channel_id == channel_id)
+			return entry;
 	}
-	cds_err("Channel %d status info not exist", channel_id);
+	sme_err("Channel %d status info not exist", channel_id);
 
 	return NULL;
 }
 
-void csr_clear_channel_status(void *p_mac)
+void csr_clear_channel_status(tpAniSirGlobal mac)
 {
-	tpAniSirGlobal mac_ptr = (tpAniSirGlobal)p_mac;
 	struct lim_scan_channel_status *channel_status;
 
-	if (!mac_ptr->sap.acs_with_more_param)
+	if (!mac->sap.acs_with_more_param)
 		return;
 
-	channel_status = (struct lim_scan_channel_status *)
-			&mac_ptr->lim.scan_channel_status;
+	channel_status = &mac->lim.scan_channel_status;
 	channel_status->total_channel = 0;
 
 	return;