From: Chengwen Feng <[email protected]>

Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.

Signed-off-by: Chengwen Feng <[email protected]>
---
 drivers/crypto/caam_jr/caam_jr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index 01a9bed1ff..7d3355975b 100644
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -1514,7 +1514,7 @@ static int
 caam_jr_queue_pair_setup(
                struct rte_cryptodev *dev, uint16_t qp_id,
                __rte_unused const struct rte_cryptodev_qp_conf *qp_conf,
-               __rte_unused int socket_id)
+               __rte_unused int numa_id)
 {
        struct sec_job_ring_t *internals;
        struct caam_jr_qp *qp = NULL;
@@ -1962,7 +1962,7 @@ caam_jr_dev_configure(struct rte_cryptodev *dev,
                                                sizeof(struct caam_jr_op_ctx),
                                                CTX_POOL_CACHE_SIZE, 0,
                                                NULL, NULL, NULL, NULL,
-                                               SOCKET_ID_ANY, 0);
+                                               RTE_NUMA_ID_ANY, 0);
                if (!internals->ctx_pool) {
                        CAAM_JR_ERR("%s create failed", str);
                        return -ENOMEM;
@@ -2373,7 +2373,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
        struct rte_cryptodev_pmd_init_params init_params = {
                "",
                sizeof(struct sec_job_ring_t),
-               rte_socket_id(),
+               rte_numa_id(),
                RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS
        };
        const char *name;
@@ -2455,7 +2455,7 @@ static struct cryptodev_driver caam_jr_crypto_drv;
 RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_CAAM_JR_PMD, cryptodev_caam_jr_drv);
 RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_CAAM_JR_PMD,
        "max_nb_queue_pairs=<int>"
-       "socket_id=<int>");
+       "numa_id=<int>");
 RTE_PMD_REGISTER_CRYPTO_DRIVER(caam_jr_crypto_drv, 
cryptodev_caam_jr_drv.driver,
                cryptodev_driver_id);
 
-- 
2.55.0

Reply via email to