From eab3348cb2ae402697e2af4e97fada502a076922 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Mon, 21 Sep 2020 14:24:28 -0700 Subject: [PATCH] qcacld-3.0: dp: Remove logs for qdf_mem_malloc() checks qdf_mem_malloc() function already takes care of logging the caller function name and line number in case of any allocation error. Hence there is no need to add the error log again. Getting rid of these unnecessary logs reduces driver memory footprint. Change-Id: If24f25fb61bda6f9cd18ec45c5ded2eb53748736 CRs-Fixed: 2781932 --- core/bmi/src/ol_fw.c | 5 +---- core/dp/txrx/ol_rx_reorder.c | 4 +--- core/dp/txrx/ol_txrx_ipa.c | 4 +--- core/dp/txrx3.0/dp_rx_fst.c | 12 ++---------- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 198b92e1e93a..ed9115d64428 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -362,7 +362,6 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, enum ATH_BIN_FILE file, temp_eeprom = qdf_mem_malloc(fw_entry_size); if (!temp_eeprom) { - BMI_ERR("%s: Memory allocation failed", __func__); status = -ENOMEM; goto release_fw; } @@ -594,10 +593,8 @@ int ol_copy_ramdump(struct hif_opaque_softc *scn) return 0; } info = qdf_mem_malloc(sizeof(struct ramdump_info)); - if (!info) { - BMI_ERR("%s Memory for Ramdump Allocation failed", __func__); + if (!info) return -ENOMEM; - } ol_get_ramdump_mem(qdf_dev->dev, info); diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c index 8b37ec84ee58..c92441a11546 100644 --- a/core/dp/txrx/ol_rx_reorder.c +++ b/core/dp/txrx/ol_rx_reorder.c @@ -556,10 +556,8 @@ ol_rx_addba_handler(ol_txrx_pdev_handle pdev, round_pwr2_win_sz * sizeof(struct ol_rx_reorder_array_elem_t); array_mem = qdf_mem_malloc(array_size); - if (!array_mem) { - ol_txrx_err("memory allocation failed"); + if (!array_mem) return; - } if (rx_reorder->array != &rx_reorder->base) { ol_txrx_info("delete array for tid %d", tid); diff --git a/core/dp/txrx/ol_txrx_ipa.c b/core/dp/txrx/ol_txrx_ipa.c index 5ad3035cd3f4..3fe6cd02afd9 100644 --- a/core/dp/txrx/ol_txrx_ipa.c +++ b/core/dp/txrx/ol_txrx_ipa.c @@ -659,10 +659,8 @@ QDF_STATUS ol_txrx_ipa_setup(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, } pipe_in = qdf_mem_malloc(sizeof(*pipe_in)); - if (!pipe_in) { - ol_txrx_err("pipe_in allocation failed"); + if (!pipe_in) return QDF_STATUS_E_NOMEM; - } ipa_res = &pdev->ipa_resource; qdf_mem_zero(pipe_in, sizeof(*pipe_in)); diff --git a/core/dp/txrx3.0/dp_rx_fst.c b/core/dp/txrx3.0/dp_rx_fst.c index 2d299c387cdd..24367adedc17 100644 --- a/core/dp/txrx3.0/dp_rx_fst.c +++ b/core/dp/txrx3.0/dp_rx_fst.c @@ -212,11 +212,8 @@ QDF_STATUS dp_rx_fst_attach(struct dp_soc *soc, struct dp_pdev *pdev) } fst = qdf_mem_malloc(sizeof(struct dp_rx_fst)); - if (!fst) { - QDF_TRACE(QDF_MODULE_ID_ANY, QDF_TRACE_LEVEL_ERROR, - "RX FST allocation failed\n"); + if (!fst) return QDF_STATUS_E_NOMEM; - } fst->max_skid_length = wlan_cfg_rx_fst_get_max_search(cfg); fst->max_entries = wlan_cfg_get_rx_flow_search_table_size(cfg); @@ -230,13 +227,8 @@ QDF_STATUS dp_rx_fst_attach(struct dp_soc *soc, struct dp_pdev *pdev) fst->base = (uint8_t *)qdf_mem_malloc(DP_RX_GET_SW_FT_ENTRY_SIZE * fst->max_entries); - if (!fst->base) { - QDF_TRACE(QDF_MODULE_ID_ANY, QDF_TRACE_LEVEL_ERROR, - "Rx fst->base allocation failed, #entries:%d\n", - fst->max_entries); - + if (!fst->base) goto out2; - } fst->hal_rx_fst = hal_rx_fst_attach(soc->osdev, &fst->hal_rx_fst_base_paddr,