From: Shai Brandes <shaib...@amazon.com>
Remove an unused dev_node parameter when allocating DMA memory.
Signed-off-by: Shai Brandes <shaib...@amazon.com>
---
drivers/net/ena/base/ena_com.c | 9 ++-------
drivers/net/ena/base/ena_plat_dpdk.h | 11 +++++------
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c
index 24756e5e76..9e1fa40c0c 100644
--- a/drivers/net/ena/base/ena_com.c
+++ b/drivers/net/ena/base/ena_com.c
@@ -328,7 +328,6 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev,
struct ena_com_io_sq *io_sq)
{
size_t size;
- int dev_node = 0;
memset(&io_sq->desc_addr, 0x0, sizeof(io_sq->desc_addr));
@@ -347,8 +346,7 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev,
io_sq->desc_addr.virt_addr,
io_sq->desc_addr.phys_addr,
io_sq->desc_addr.mem_handle,
- ctx->numa_node,
- dev_node);
+ ctx->numa_node);
if (!io_sq->desc_addr.virt_addr) {
ENA_MEM_ALLOC_COHERENT(ena_dev->dmadev,
size,
@@ -377,8 +375,7 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev,
ENA_MEM_ALLOC_NODE(ena_dev->dmadev,
size,
io_sq->bounce_buf_ctrl.base_buffer,
- ctx->numa_node,
- dev_node);
+ ctx->numa_node);
if (!io_sq->bounce_buf_ctrl.base_buffer)
io_sq->bounce_buf_ctrl.base_buffer =
ENA_MEM_ALLOC(ena_dev->dmadev, size);
@@ -417,7 +414,6 @@ static int ena_com_init_io_cq(struct ena_com_dev *ena_dev,
struct ena_com_io_cq *io_cq)
{
size_t size;
- int prev_node = 0;
memset(&io_cq->cdesc_addr, 0x0, sizeof(io_cq->cdesc_addr));
@@ -436,7 +432,6 @@ static int ena_com_init_io_cq(struct ena_com_dev *ena_dev,
io_cq->cdesc_addr.phys_addr,
io_cq->cdesc_addr.mem_handle,
ctx->numa_node,
- prev_node,
ENA_CDESC_RING_SIZE_ALIGNMENT);
if (!io_cq->cdesc_addr.virt_addr) {
ENA_MEM_ALLOC_COHERENT_ALIGNED(ena_dev->dmadev,
diff --git a/drivers/net/ena/base/ena_plat_dpdk.h
b/drivers/net/ena/base/ena_plat_dpdk.h
index dffe60705d..eaa509bc2a 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -240,23 +240,22 @@ ena_mem_alloc_coherent(struct rte_eth_dev_data *data,
size_t size,
rte_memzone_free(mem_handle); })
#define ENA_MEM_ALLOC_COHERENT_NODE_ALIGNED( \
- dmadev, size, virt, phys, mem_handle, node, dev_node, alignment) \
+ dmadev, size, virt, phys, mem_handle, node, alignment)
\
do { \
void *virt_addr; \
dma_addr_t phys_addr; \
- ENA_TOUCH(dev_node); \
(mem_handle) = ena_mem_alloc_coherent((dmadev), (size), \
(node), (alignment), &virt_addr, &phys_addr); \
(virt) = virt_addr; \
(phys) = phys_addr; \
} while (0)
#define ENA_MEM_ALLOC_COHERENT_NODE( \
- dmadev, size, virt, phys, mem_handle, node, dev_node) \
+ dmadev, size, virt, phys, mem_handle, node)
\
ENA_MEM_ALLOC_COHERENT_NODE_ALIGNED(dmadev, size, virt, phys, \
- mem_handle, node, dev_node, RTE_CACHE_LINE_SIZE)
-#define ENA_MEM_ALLOC_NODE(dmadev, size, virt, node, dev_node) \
+ mem_handle, node, RTE_CACHE_LINE_SIZE)
+#define ENA_MEM_ALLOC_NODE(dmadev, size, virt, node)
\
do { \
- ENA_TOUCH(dmadev); ENA_TOUCH(dev_node); \
+ ENA_TOUCH(dmadev);
\
virt = rte_zmalloc_socket(NULL, size, 0, node); \
} while (0)
--
2.17.1
