This improves readability.
Signed-off-by: Andrew Boyer <andrew.boyer@amd.com>
---
drivers/net/ionic/ionic_lif.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
@@ -576,6 +576,7 @@ ionic_qcq_alloc(struct ionic_lif *lif,
rte_iova_t q_base_pa = 0;
rte_iova_t cq_base_pa = 0;
rte_iova_t sg_base_pa = 0;
+ size_t page_size = rte_mem_page_size();
int err;
*qcq = NULL;
@@ -584,18 +585,18 @@ ionic_qcq_alloc(struct ionic_lif *lif,
cq_size = num_descs * cq_desc_size;
sg_size = num_descs * sg_desc_size;
- total_size = RTE_ALIGN(q_size, rte_mem_page_size()) +
- RTE_ALIGN(cq_size, rte_mem_page_size());
+ total_size = RTE_ALIGN(q_size, page_size) +
+ RTE_ALIGN(cq_size, page_size);
/*
* Note: aligning q_size/cq_size is not enough due to cq_base address
* aligning as q_base could be not aligned to the page.
- * Adding rte_mem_page_size().
+ * Adding page_size.
*/
- total_size += rte_mem_page_size();
+ total_size += page_size;
if (flags & IONIC_QCQ_F_SG) {
- total_size += RTE_ALIGN(sg_size, rte_mem_page_size());
- total_size += rte_mem_page_size();
+ total_size += RTE_ALIGN(sg_size, page_size);
+ total_size += page_size;
}
new = rte_zmalloc_socket("ionic", struct_size,
@@ -610,7 +611,7 @@ ionic_qcq_alloc(struct ionic_lif *lif,
/* Most queue types will store 1 ptr per descriptor */
new->q.info = rte_calloc_socket("ionic",
num_descs * num_segs, sizeof(void *),
- rte_mem_page_size(), socket_id);
+ page_size, socket_id);
if (!new->q.info) {
IONIC_PRINT(ERR, "Cannot allocate queue info");
err = -ENOMEM;
@@ -648,16 +649,13 @@ ionic_qcq_alloc(struct ionic_lif *lif,
q_base = new->base;
q_base_pa = new->base_pa;
- cq_base = (void *)RTE_ALIGN((uintptr_t)q_base + q_size,
- rte_mem_page_size());
- cq_base_pa = RTE_ALIGN(q_base_pa + q_size,
- rte_mem_page_size());
+ cq_base = (void *)RTE_ALIGN((uintptr_t)q_base + q_size, page_size);
+ cq_base_pa = RTE_ALIGN(q_base_pa + q_size, page_size);
if (flags & IONIC_QCQ_F_SG) {
sg_base = (void *)RTE_ALIGN((uintptr_t)cq_base + cq_size,
- rte_mem_page_size());
- sg_base_pa = RTE_ALIGN(cq_base_pa + cq_size,
- rte_mem_page_size());
+ page_size);
+ sg_base_pa = RTE_ALIGN(cq_base_pa + cq_size, page_size);
ionic_q_sg_map(&new->q, sg_base, sg_base_pa);
}