samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Remove error log for qdf_mem_malloc in qdf files

Browse Source 
qdf layer already has the error trace

Change-Id: I451e8a008585d80c9d3ccb619461362a74d0a52b
CRs-Fixed: 2374111
This commit is contained in:
Madhvapathi Sriram
2019-01-07 09:02:08 +05:30
committed by nshrivas
parent 0c5bdd7e73
commit 2750c27818
6 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qdf/linux/src/qdf_crypto.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
* Copyright (c) 2017-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
@@ -395,8 +395,6 @@ int qdf_crypto_aes_gmac(uint8_t *key, uint16_t key_length,
IEEE80211_MMIE_GMAC_MICLEN + AAD_LEN;
req = qdf_mem_malloc(req_size);
if (!req) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"Memory allocation failed");
ret = -ENOMEM;
goto err_tfm;
}

6
qdf/linux/src/qdf_event.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014-2018 The Linux Foundation. All rights reserved.
* Copyright (c) 2014-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
@@ -298,10 +298,8 @@ QDF_STATUS qdf_wait_for_event_completion(qdf_event_t *event, uint32_t timeout)
return QDF_STATUS_E_INVAL;
event_node = qdf_mem_malloc(sizeof(*event_node));
if (!event_node) {
qdf_err("Out of memory");
if (!event_node)
return QDF_STATUS_E_NOMEM;
}
event_node->pevent = event;

3
qdf/linux/src/qdf_file.c
View File

@@ -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
@@ -41,7 +41,6 @@ QDF_STATUS qdf_file_read(const char *path, char **out_buf)
/* qdf_mem_malloc zeros new memory; +1 size ensures null-termination */
buf = qdf_mem_malloc(fw->size + 1);
if (!buf) {
qdf_err("Failed to allocate file buffer of %zuB", fw->size + 1);
release_firmware(fw);
return QDF_STATUS_E_NOMEM;
}

7
qdf/linux/src/qdf_lro.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2015-2017, 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
@@ -133,11 +133,8 @@ qdf_lro_ctx_t qdf_lro_init(void)
lro_mem_ptr = qdf_mem_malloc(lro_info_sz + lro_mgr_sz + desc_arr_sz +
desc_pool_sz + hash_table_sz);
if (unlikely(!lro_mem_ptr)) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"Unable to allocate memory for LRO");
if (unlikely(!lro_mem_ptr))
return NULL;
}
lro_ctx = (struct qdf_lro_s *)lro_mem_ptr;
lro_mem_ptr += lro_info_sz;

5
qdf/linux/src/qdf_mc_timer.c
View File

@@ -366,10 +366,7 @@ QDF_STATUS qdf_mc_timer_init_debug(qdf_mc_timer_t *timer,
timer->timer_node = qdf_mem_malloc(sizeof(qdf_mc_timer_node_t));
if (timer->timer_node == NULL) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"%s: Not able to allocate memory for time_node",
__func__);
if (!timer->timer_node) {
QDF_ASSERT(0);
return QDF_STATUS_E_NOMEM;
}

17
qdf/linux/src/qdf_mem.c
View File

@@ -1268,28 +1268,21 @@ void qdf_mem_multi_pages_alloc(qdf_device_t osdev,
/* Pages information storage */
pages->cacheable_pages = qdf_mem_malloc(
pages->num_pages * sizeof(pages->cacheable_pages));
if (!pages->cacheable_pages) {
qdf_print("Cacheable page storage alloc fail");
if (!pages->cacheable_pages)
goto out_fail;
}
cacheable_pages = pages->cacheable_pages;
for (page_idx = 0; page_idx < pages->num_pages; page_idx++) {
cacheable_pages[page_idx] = qdf_mem_malloc(PAGE_SIZE);
if (!cacheable_pages[page_idx]) {
qdf_print("cacheable page alloc fail, pi %d",
page_idx);
if (!cacheable_pages[page_idx])
goto page_alloc_fail;
}
}
pages->dma_pages = NULL;
} else {
pages->dma_pages = qdf_mem_malloc(
pages->num_pages * sizeof(struct qdf_mem_dma_page_t));
if (!pages->dma_pages) {
qdf_print("dmaable page storage alloc fail");
if (!pages->dma_pages)
goto out_fail;
}
dma_pages = pages->dma_pages;
for (page_idx = 0; page_idx < pages->num_pages; page_idx++) {
@@ -1476,10 +1469,8 @@ qdf_shared_mem_t *qdf_mem_shared_mem_alloc(qdf_device_t osdev, uint32_t size)
int ret;
shared_mem = qdf_mem_malloc(sizeof(*shared_mem));
if (!shared_mem) {
qdf_err("Unable to allocate memory for shared resource struct");
if (!shared_mem)
return NULL;
}
shared_mem->vaddr = qdf_mem_alloc_consistent(osdev, osdev->dev,
size, qdf_mem_get_dma_addr_ptr(osdev,