فهرست منبع

qcacld-3.0: Remove __func__ from the DP logs

Logging macros already takes care of adding function name.
Hence, delete the occurrence of __func__.

Change-Id: Iee88f5b9620a70a3707c254866201447c10dcbbd
CRs-Fixed: 3492707
Srinivas Girigowda 2 سال پیش
والد
کامیت
b0fbbd3cc7
5فایلهای تغییر یافته به همراه28 افزوده شده و 27 حذف شده
  1. 2 2
      core/dp/txrx/ol_rx_defrag.c
  2. 3 3
      core/dp/txrx/ol_rx_reorder.c
  3. 3 2
      core/dp/txrx/ol_tx.c
  4. 2 2
      core/dp/txrx/ol_txrx.c
  5. 18 18
      core/dp/txrx/ol_txrx_ipa.c

+ 2 - 2
core/dp/txrx/ol_rx_defrag.c

@@ -318,7 +318,7 @@ ol_rx_frag_indication_handler(ol_txrx_pdev_handle pdev,
 	void *rx_desc;
 
 	if (tid >= OL_TXRX_NUM_EXT_TIDS) {
-		ol_txrx_err("%s:  invalid tid, %u", __FUNCTION__, tid);
+		ol_txrx_err("Invalid tid: %u", tid);
 		return;
 	}
 
@@ -655,7 +655,7 @@ void ol_rx_defrag_waitlist_flush(struct ol_txrx_pdev_t *pdev)
 
 		tid = rx_reorder->tid;
 		if (tid >= OL_TXRX_NUM_EXT_TIDS) {
-			ol_txrx_err("%s:  invalid tid, %u", __FUNCTION__, tid);
+			ol_txrx_err("Invalid tid: %u", tid);
 			WARN_ON(1);
 			continue;
 		}

+ 3 - 3
core/dp/txrx/ol_rx_reorder.c

@@ -459,7 +459,7 @@ static void ol_rx_reorder_detect_hole(struct ol_txrx_peer_t *peer,
 	uint32_t win_sz_mask, next_rel_idx, hole_size;
 
 	if (tid >= OL_TXRX_NUM_EXT_TIDS) {
-		ol_txrx_err("%s:  invalid tid, %u", __FUNCTION__, tid);
+		ol_txrx_err("Invalid tid: %u", tid);
 		return;
 	}
 
@@ -632,7 +632,7 @@ ol_rx_flush_handler(ol_txrx_pdev_handle pdev,
 	htt_pdev_handle htt_pdev = pdev->htt_pdev;
 
 	if (tid >= OL_TXRX_NUM_EXT_TIDS) {
-		ol_txrx_err("%s:  invalid tid, %u", __FUNCTION__, tid);
+		ol_txrx_err("Invalid tid: %u", tid);
 		return;
 	}
 
@@ -693,7 +693,7 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev,
 	int i = 0;
 
 	if (tid >= OL_TXRX_NUM_EXT_TIDS) {
-		ol_txrx_err("%s:  invalid tid, %u", __FUNCTION__, tid);
+		ol_txrx_err("Invalid tid: %u", tid);
 		WARN_ON(1);
 		return;
 	}

+ 3 - 2
core/dp/txrx/ol_tx.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. 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
@@ -100,11 +101,11 @@ qdf_nbuf_t ol_tx_send_ipa_data_frame(struct cdp_soc_t *soc_hdl, uint8_t vdev_id,
 	qdf_nbuf_t ret;
 
 	if (qdf_unlikely(!pdev)) {
-		ol_txrx_err("%s: invalid pdev", __func__);
+		ol_txrx_err("Invalid pdev");
 		return skb;
 	}
 	if (qdf_unlikely(!vdev)) {
-		ol_txrx_err("%s: invalid vdev, vdev_id:%d", __func__, vdev_id);
+		ol_txrx_err("Invalid vdev, vdev_id:%d", vdev_id);
 		return skb;
 	}
 

+ 2 - 2
core/dp/txrx/ol_txrx.c

@@ -3522,7 +3522,7 @@ static QDF_STATUS ol_txrx_peer_detach(struct cdp_soc_t *soc_hdl,
 	if (!peer)
 		return QDF_STATUS_E_FAILURE;
 
-	ol_txrx_info_high("%s peer %pK, peer->ref_cnt %d", __func__,
+	ol_txrx_info_high("peer %pK, peer->ref_cnt %d",
 			  peer, qdf_atomic_read(&peer->ref_cnt));
 
 	/* redirect peer's rx delivery function to point to a discard func */
@@ -4164,7 +4164,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev,
 	}
 	req = ol_txrx_fw_stats_desc_get_req(pdev, (uint8_t)cookie);
 	if (!req) {
-		ol_txrx_err("%s: Request not retrieved for cookie %u", __func__,
+		ol_txrx_err("Request not retrieved for cookie %u",
 			    (uint8_t)cookie);
 		return;
 	}

+ 18 - 18
core/dp/txrx/ol_txrx_ipa.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. 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 above
@@ -116,7 +116,7 @@ QDF_STATUS ol_txrx_ipa_uc_get_resource(struct cdp_soc_t *soc_hdl,
 	qdf_device_t osdev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -160,7 +160,7 @@ QDF_STATUS ol_txrx_ipa_uc_set_doorbell_paddr(struct cdp_soc_t *soc_hdl,
 	int ret;
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -186,7 +186,7 @@ QDF_STATUS ol_txrx_ipa_uc_set_active(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
 	int ret;
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -207,7 +207,7 @@ QDF_STATUS ol_txrx_ipa_uc_op_response(struct cdp_soc_t *soc_hdl,
 	ol_txrx_pdev_handle pdev = ol_txrx_get_pdev_from_pdev_id(soc, pdev_id);
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -232,7 +232,7 @@ QDF_STATUS ol_txrx_ipa_uc_register_op_cb(struct cdp_soc_t *soc_hdl,
 	ol_txrx_pdev_handle pdev = ol_txrx_get_pdev_from_pdev_id(soc, pdev_id);
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -249,7 +249,7 @@ QDF_STATUS ol_txrx_ipa_uc_get_stat(struct cdp_soc_t *soc_hdl, uint8_t pdev_id)
 	int ret;
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -678,7 +678,7 @@ QDF_STATUS ol_txrx_ipa_setup(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
 	int ret;
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -811,7 +811,7 @@ QDF_STATUS ol_txrx_ipa_cleanup(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
 
 	pdev = ol_txrx_get_pdev_from_pdev_id(soc, OL_TXRX_PDEV_ID);
 	if (!pdev) {
-		ol_txrx_err("%s NULL pdev invalid instance", __func__);
+		ol_txrx_err("NULL pdev invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -821,13 +821,13 @@ QDF_STATUS ol_txrx_ipa_cleanup(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
 				     ipa_res->rx_ready_doorbell_dmaaddr,
 				     sizeof(uint32_t));
 		if (ret)
-			ol_txrx_err("%s rx_ready, smmu unmap failed", __func__);
+			ol_txrx_err("rx_ready, smmu unmap failed");
 
 		ret = pld_smmu_unmap(osdev->dev,
 				     ipa_res->tx_comp_doorbell_dmaaddr,
 				     sizeof(uint32_t));
 		if (ret)
-			ol_txrx_err("%s tx_comp, smmu unmap failed", __func__);
+			ol_txrx_err("tx_comp, smmu unmap failed");
 	}
 
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG,
@@ -945,7 +945,7 @@ QDF_STATUS ol_txrx_ipa_enable_pipes(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
 	int ret;
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -985,7 +985,7 @@ QDF_STATUS ol_txrx_ipa_disable_pipes(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
 	int ret;
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -1190,7 +1190,7 @@ QDF_STATUS ol_txrx_ipa_setup(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
 	int ret;
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -1671,7 +1671,7 @@ QDF_STATUS ol_txrx_ipa_enable_pipes(struct cdp_soc_t *soc_hdl, uint8_t pdev_id)
 	QDF_STATUS status;
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -1743,7 +1743,7 @@ QDF_STATUS ol_txrx_ipa_disable_pipes(struct cdp_soc_t *soc_hdl, uint8_t pdev_id)
 	int result;
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -1842,7 +1842,7 @@ QDF_STATUS ol_txrx_ipa_uc_get_share_stats(struct cdp_soc_t *soc_hdl,
 	int result;
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -1865,7 +1865,7 @@ QDF_STATUS ol_txrx_ipa_uc_set_quota(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
 	int result;
 
 	if (!pdev) {
-		ol_txrx_err("%s invalid instance", __func__);
+		ol_txrx_err("Invalid instance");
 		return QDF_STATUS_E_FAILURE;
 	}