cryptodev: remove unused operation for queue count

This commit removes unused function pointer (queue_pair_count)
from struct rte_cryptodev_ops. Related functions removed as well.

Signed-off-by: Artur Trybula <arturx.trybula@intel.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
Acked-by: Anoob Joseph <anoobj@marvell.com>

diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
index c5e0878..18dbc4c 100644 (file)
--- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
+++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
@@ -248,13 +248,6 @@ qp_setup_cleanup:
        return -1;
 }
 
-/** Return the number of allocated queue pairs */
-static uint32_t
-aesni_gcm_pmd_qp_count(struct rte_cryptodev *dev)
-{
-       return dev->data->nb_queue_pairs;
-}
-
 /** Returns the size of the aesni gcm session structure */
 static unsigned
 aesni_gcm_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
@@ -329,7 +322,6 @@ struct rte_cryptodev_ops aesni_gcm_pmd_ops = {
 
                .queue_pair_setup       = aesni_gcm_pmd_qp_setup,
                .queue_pair_release     = aesni_gcm_pmd_qp_release,
-               .queue_pair_count       = aesni_gcm_pmd_qp_count,
 
                .sym_cpu_process        = aesni_gcm_pmd_cpu_crypto_process,
 

diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
index d8609ad..8456611 100644 (file)
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
@@ -721,13 +721,6 @@ qp_setup_cleanup:
        return ret;
 }
 
-/** Return the number of allocated queue pairs */
-static uint32_t
-aesni_mb_pmd_qp_count(struct rte_cryptodev *dev)
-{
-       return dev->data->nb_queue_pairs;
-}
-
 /** Returns the size of the aesni multi-buffer session structure */
 static unsigned
 aesni_mb_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
@@ -803,7 +796,6 @@ struct rte_cryptodev_ops aesni_mb_pmd_ops = {
 
                .queue_pair_setup       = aesni_mb_pmd_qp_setup,
                .queue_pair_release     = aesni_mb_pmd_qp_release,
-               .queue_pair_count       = aesni_mb_pmd_qp_count,
 
                .sym_session_get_size   = aesni_mb_pmd_sym_session_get_size,
                .sym_session_configure  = aesni_mb_pmd_sym_session_configure,

diff --git a/drivers/crypto/armv8/rte_armv8_pmd_ops.c b/drivers/crypto/armv8/rte_armv8_pmd_ops.c
index 4fd384d..01ccfb4 100644 (file)
--- a/drivers/crypto/armv8/rte_armv8_pmd_ops.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd_ops.c
@@ -257,13 +257,6 @@ qp_setup_cleanup:
        return -1;
 }
 
-/** Return the number of allocated queue pairs */
-static uint32_t
-armv8_crypto_pmd_qp_count(struct rte_cryptodev *dev)
-{
-       return dev->data->nb_queue_pairs;
-}
-
 /** Returns the size of the session structure */
 static unsigned
 armv8_crypto_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
@@ -337,7 +330,6 @@ struct rte_cryptodev_ops armv8_crypto_pmd_ops = {
 
                .queue_pair_setup       = armv8_crypto_pmd_qp_setup,
                .queue_pair_release     = armv8_crypto_pmd_qp_release,
-               .queue_pair_count       = armv8_crypto_pmd_qp_count,
 
                .sym_session_get_size   = armv8_crypto_pmd_sym_session_get_size,
                .sym_session_configure  = armv8_crypto_pmd_sym_session_configure,

diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index 8aaa3d4..5a29dd1 100644 (file)
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -1538,15 +1538,6 @@ caam_jr_queue_pair_setup(
        return 0;
 }
 
-/* Return the number of allocated queue pairs */
-static uint32_t
-caam_jr_queue_pair_count(struct rte_cryptodev *dev)
-{
-       PMD_INIT_FUNC_TRACE();
-
-       return dev->data->nb_queue_pairs;
-}
-
 /* Returns the size of the aesni gcm session structure */
 static unsigned int
 caam_jr_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
@@ -2062,7 +2053,6 @@ static struct rte_cryptodev_ops caam_jr_ops = {
        .stats_reset          = caam_jr_stats_reset,
        .queue_pair_setup     = caam_jr_queue_pair_setup,
        .queue_pair_release   = caam_jr_queue_pair_release,
-       .queue_pair_count     = caam_jr_queue_pair_count,
        .sym_session_get_size = caam_jr_sym_session_get_size,
        .sym_session_configure = caam_jr_sym_session_configure,
        .sym_session_clear    = caam_jr_sym_session_clear

diff --git a/drivers/crypto/ccp/ccp_pmd_ops.c b/drivers/crypto/ccp/ccp_pmd_ops.c
index a19e85e..98f964f 100644 (file)
--- a/drivers/crypto/ccp/ccp_pmd_ops.c
+++ b/drivers/crypto/ccp/ccp_pmd_ops.c
@@ -749,12 +749,6 @@ qp_setup_cleanup:
        return -1;
 }
 
-static uint32_t
-ccp_pmd_qp_count(struct rte_cryptodev *dev)
-{
-       return dev->data->nb_queue_pairs;
-}
-
 static unsigned
 ccp_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
 {
@@ -824,7 +818,6 @@ struct rte_cryptodev_ops ccp_ops = {
 
                .queue_pair_setup       = ccp_pmd_qp_setup,
                .queue_pair_release     = ccp_pmd_qp_release,
-               .queue_pair_count       = ccp_pmd_qp_count,
 
                .sym_session_get_size   = ccp_pmd_sym_session_get_size,
                .sym_session_configure  = ccp_pmd_sym_session_configure,

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index 6ed2701..241ec88 100644 (file)
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -1798,15 +1798,6 @@ dpaa2_sec_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        return retcode;
 }
 
-/** Return the number of allocated queue pairs */
-static uint32_t
-dpaa2_sec_queue_pair_count(struct rte_cryptodev *dev)
-{
-       PMD_INIT_FUNC_TRACE();
-
-       return dev->data->nb_queue_pairs;
-}
-
 /** Returns the size of the aesni gcm session structure */
 static unsigned int
 dpaa2_sec_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
@@ -3674,7 +3665,6 @@ static struct rte_cryptodev_ops crypto_ops = {
        .stats_reset          = dpaa2_sec_stats_reset,
        .queue_pair_setup     = dpaa2_sec_queue_pair_setup,
        .queue_pair_release   = dpaa2_sec_queue_pair_release,
-       .queue_pair_count     = dpaa2_sec_queue_pair_count,
        .sym_session_get_size     = dpaa2_sec_sym_session_get_size,
        .sym_session_configure    = dpaa2_sec_sym_session_configure,
        .sym_session_clear        = dpaa2_sec_sym_session_clear,

diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
index df684d2..a11b17b 100644 (file)
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -1990,15 +1990,6 @@ dpaa_sec_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        return 0;
 }
 
-/** Return the number of allocated queue pairs */
-static uint32_t
-dpaa_sec_queue_pair_count(struct rte_cryptodev *dev)
-{
-       PMD_INIT_FUNC_TRACE();
-
-       return dev->data->nb_queue_pairs;
-}
-
 /** Returns the size of session structure */
 static unsigned int
 dpaa_sec_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
@@ -3296,7 +3287,6 @@ static struct rte_cryptodev_ops crypto_ops = {
        .dev_infos_get        = dpaa_sec_dev_infos_get,
        .queue_pair_setup     = dpaa_sec_queue_pair_setup,
        .queue_pair_release   = dpaa_sec_queue_pair_release,
-       .queue_pair_count     = dpaa_sec_queue_pair_count,
        .sym_session_get_size     = dpaa_sec_sym_session_get_size,
        .sym_session_configure    = dpaa_sec_sym_session_configure,
        .sym_session_clear        = dpaa_sec_sym_session_clear

diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c b/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c
index 55fbe00..43376c1 100644 (file)
--- a/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c
@@ -232,13 +232,6 @@ qp_setup_cleanup:
        return -1;
 }
 
-/** Return the number of allocated queue pairs */
-static uint32_t
-kasumi_pmd_qp_count(struct rte_cryptodev *dev)
-{
-       return dev->data->nb_queue_pairs;
-}
-
 /** Returns the size of the KASUMI session structure */
 static unsigned
 kasumi_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
@@ -314,7 +307,6 @@ struct rte_cryptodev_ops kasumi_pmd_ops = {
 
                .queue_pair_setup   = kasumi_pmd_qp_setup,
                .queue_pair_release = kasumi_pmd_qp_release,
-               .queue_pair_count   = kasumi_pmd_qp_count,
 
                .sym_session_get_size   = kasumi_pmd_sym_session_get_size,
                .sym_session_configure  = kasumi_pmd_sym_session_configure,

diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
index 2dfaa0b..c61bdca 100644 (file)
--- a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
@@ -702,17 +702,6 @@ mrvl_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        return -1;
 }
 
-/** Return the number of allocated queue pairs (PMD ops callback).
- *
- * @param dev Pointer to the device structure.
- * @returns Number of allocated queue pairs.
- */
-static uint32_t
-mrvl_crypto_pmd_qp_count(struct rte_cryptodev *dev)
-{
-       return dev->data->nb_queue_pairs;
-}
-
 /** Returns the size of the session structure (PMD ops callback).
  *
  * @param dev Pointer to the device structure [Unused].
@@ -827,7 +816,6 @@ static struct rte_cryptodev_ops mrvl_crypto_pmd_ops = {
 
                .queue_pair_setup       = mrvl_crypto_pmd_qp_setup,
                .queue_pair_release     = mrvl_crypto_pmd_qp_release,
-               .queue_pair_count       = mrvl_crypto_pmd_qp_count,
 
                .sym_session_get_size   = mrvl_crypto_pmd_sym_session_get_size,
                .sym_session_configure  = mrvl_crypto_pmd_sym_session_configure,

diff --git a/drivers/crypto/null/null_crypto_pmd_ops.c b/drivers/crypto/null/null_crypto_pmd_ops.c
index d988bfe..d67892a 100644 (file)
--- a/drivers/crypto/null/null_crypto_pmd_ops.c
+++ b/drivers/crypto/null/null_crypto_pmd_ops.c
@@ -247,13 +247,6 @@ qp_setup_cleanup:
        return -1;
 }
 
-/** Return the number of allocated queue pairs */
-static uint32_t
-null_crypto_pmd_qp_count(struct rte_cryptodev *dev)
-{
-       return dev->data->nb_queue_pairs;
-}
-
 /** Returns the size of the NULL crypto session structure */
 static unsigned
 null_crypto_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
@@ -327,7 +320,6 @@ static struct rte_cryptodev_ops pmd_ops = {
 
                .queue_pair_setup       = null_crypto_pmd_qp_setup,
                .queue_pair_release     = null_crypto_pmd_qp_release,
-               .queue_pair_count       = null_crypto_pmd_qp_count,
 
                .sym_session_get_size   = null_crypto_pmd_sym_session_get_size,
                .sym_session_configure  = null_crypto_pmd_sym_session_configure,

diff --git a/drivers/crypto/octeontx/otx_cryptodev_ops.c b/drivers/crypto/octeontx/otx_cryptodev_ops.c
index d7f3d08..51520e7 100644 (file)
--- a/drivers/crypto/octeontx/otx_cryptodev_ops.c
+++ b/drivers/crypto/octeontx/otx_cryptodev_ops.c
@@ -898,7 +898,6 @@ static struct rte_cryptodev_ops cptvf_ops = {
        .stats_reset = otx_cpt_stats_reset,
        .queue_pair_setup = otx_cpt_que_pair_setup,
        .queue_pair_release = otx_cpt_que_pair_release,
-       .queue_pair_count = NULL,
 
        /* Crypto related operations */
        .sym_session_get_size = otx_cpt_get_session_size,

diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
index 7eebb49..a8305f4 100644 (file)
--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
@@ -1204,7 +1204,6 @@ struct rte_cryptodev_ops otx2_cpt_ops = {
        .stats_reset = NULL,
        .queue_pair_setup = otx2_cpt_queue_pair_setup,
        .queue_pair_release = otx2_cpt_queue_pair_release,
-       .queue_pair_count = NULL,
 
        /* Symmetric crypto ops */
        .sym_session_get_size = otx2_cpt_sym_session_get_size,

diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
index cbfb814..ed75877 100644 (file)
--- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
@@ -754,13 +754,6 @@ qp_setup_cleanup:
        return -1;
 }
 
-/** Return the number of allocated queue pairs */
-static uint32_t
-openssl_pmd_qp_count(struct rte_cryptodev *dev)
-{
-       return dev->data->nb_queue_pairs;
-}
-
 /** Returns the size of the symmetric session structure */
 static unsigned
 openssl_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
@@ -1242,7 +1235,6 @@ struct rte_cryptodev_ops openssl_pmd_ops = {
 
                .queue_pair_setup       = openssl_pmd_qp_setup,
                .queue_pair_release     = openssl_pmd_qp_release,
-               .queue_pair_count       = openssl_pmd_qp_count,
 
                .sym_session_get_size   = openssl_pmd_sym_session_get_size,
                .asym_session_get_size  = openssl_pmd_asym_session_get_size,

diff --git a/drivers/crypto/qat/qat_asym_pmd.c b/drivers/crypto/qat/qat_asym_pmd.c
index cdf10de..af3cc25 100644 (file)
--- a/drivers/crypto/qat/qat_asym_pmd.c
+++ b/drivers/crypto/qat/qat_asym_pmd.c
@@ -203,7 +203,6 @@ struct rte_cryptodev_ops crypto_qat_ops = {
        .stats_reset            = qat_asym_stats_reset,
        .queue_pair_setup       = qat_asym_qp_setup,
        .queue_pair_release     = qat_asym_qp_release,
-       .queue_pair_count       = NULL,
 
        /* Crypto related operations */
        .asym_session_get_size  = qat_asym_session_get_private_size,

diff --git a/drivers/crypto/qat/qat_sym_pmd.c b/drivers/crypto/qat/qat_sym_pmd.c
index 666ede7..50abdf6 100644 (file)
--- a/drivers/crypto/qat/qat_sym_pmd.c
+++ b/drivers/crypto/qat/qat_sym_pmd.c
@@ -203,7 +203,6 @@ static struct rte_cryptodev_ops crypto_qat_ops = {
                .stats_reset            = qat_sym_stats_reset,
                .queue_pair_setup       = qat_sym_qp_setup,
                .queue_pair_release     = qat_sym_qp_release,
-               .queue_pair_count       = NULL,
 
                /* Crypto related operations */
                .sym_session_get_size   = qat_sym_session_get_private_size,

diff --git a/drivers/crypto/scheduler/scheduler_pmd_ops.c b/drivers/crypto/scheduler/scheduler_pmd_ops.c
index cf70218..14e5a37 100644 (file)
--- a/drivers/crypto/scheduler/scheduler_pmd_ops.c
+++ b/drivers/crypto/scheduler/scheduler_pmd_ops.c
@@ -454,13 +454,6 @@ scheduler_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        return 0;
 }
 
-/** Return the number of allocated queue pairs */
-static uint32_t
-scheduler_pmd_qp_count(struct rte_cryptodev *dev)
-{
-       return dev->data->nb_queue_pairs;
-}
-
 static uint32_t
 scheduler_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
 {
@@ -534,7 +527,6 @@ static struct rte_cryptodev_ops scheduler_pmd_ops = {
 
                .queue_pair_setup       = scheduler_pmd_qp_setup,
                .queue_pair_release     = scheduler_pmd_qp_release,
-               .queue_pair_count       = scheduler_pmd_qp_count,
 
                .sym_session_get_size   = scheduler_pmd_sym_session_get_size,
                .sym_session_configure  = scheduler_pmd_sym_session_configure,

diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
index ea76637..906a0fe 100644 (file)
--- a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
@@ -239,13 +239,6 @@ qp_setup_cleanup:
        return -1;
 }
 
-/** Return the number of allocated queue pairs */
-static uint32_t
-snow3g_pmd_qp_count(struct rte_cryptodev *dev)
-{
-       return dev->data->nb_queue_pairs;
-}
-
 /** Returns the size of the SNOW 3G session structure */
 static unsigned
 snow3g_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
@@ -321,7 +314,6 @@ struct rte_cryptodev_ops snow3g_pmd_ops = {
 
                .queue_pair_setup   = snow3g_pmd_qp_setup,
                .queue_pair_release = snow3g_pmd_qp_release,
-               .queue_pair_count   = snow3g_pmd_qp_count,
 
                .sym_session_get_size   = snow3g_pmd_sym_session_get_size,
                .sym_session_configure  = snow3g_pmd_sym_session_configure,

diff --git a/drivers/crypto/virtio/virtio_cryptodev.c b/drivers/crypto/virtio/virtio_cryptodev.c
index 4af479f..e7fb71a 100644 (file)
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -514,7 +514,6 @@ static struct rte_cryptodev_ops virtio_crypto_dev_ops = {
 
        .queue_pair_setup                = virtio_crypto_qp_setup,
        .queue_pair_release              = virtio_crypto_qp_release,
-       .queue_pair_count                = NULL,
 
        /* Crypto related operations */
        .sym_session_get_size           = virtio_crypto_sym_get_session_private_size,

diff --git a/drivers/crypto/zuc/rte_zuc_pmd_ops.c b/drivers/crypto/zuc/rte_zuc_pmd_ops.c
index ddd0f92..dc9dc25 100644 (file)
--- a/drivers/crypto/zuc/rte_zuc_pmd_ops.c
+++ b/drivers/crypto/zuc/rte_zuc_pmd_ops.c
@@ -239,13 +239,6 @@ qp_setup_cleanup:
        return -1;
 }
 
-/** Return the number of allocated queue pairs */
-static uint32_t
-zuc_pmd_qp_count(struct rte_cryptodev *dev)
-{
-       return dev->data->nb_queue_pairs;
-}
-
 /** Returns the size of the ZUC session structure */
 static unsigned
 zuc_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
@@ -320,7 +313,6 @@ struct rte_cryptodev_ops zuc_pmd_ops = {
 
                .queue_pair_setup   = zuc_pmd_qp_setup,
                .queue_pair_release = zuc_pmd_qp_release,
-               .queue_pair_count   = zuc_pmd_qp_count,
 
                .sym_session_get_size   = zuc_pmd_sym_session_get_size,
                .sym_session_configure  = zuc_pmd_sym_session_configure,

diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/librte_cryptodev/rte_cryptodev_pmd.h
index 0e6b5f4..81975d7 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev_pmd.h
+++ b/lib/librte_cryptodev/rte_cryptodev_pmd.h
@@ -207,15 +207,6 @@ typedef int (*cryptodev_queue_pair_setup_t)(struct rte_cryptodev *dev,
 typedef int (*cryptodev_queue_pair_release_t)(struct rte_cryptodev *dev,
                uint16_t qp_id);
 
-/**
- * Get number of available queue pairs of a device.
- *
- * @param      dev     Crypto device pointer
- *
- * @return     Returns number of queue pairs on success.
- */
-typedef uint32_t (*cryptodev_queue_pair_count_t)(struct rte_cryptodev *dev);
-
 /**
  * Create a session mempool to allocate sessions from
  *
@@ -344,8 +335,6 @@ struct rte_cryptodev_ops {
        /**< Set up a device queue pair. */
        cryptodev_queue_pair_release_t queue_pair_release;
        /**< Release a queue pair. */
-       cryptodev_queue_pair_count_t queue_pair_count;
-       /**< Get count of the queue pairs. */
 
        cryptodev_sym_get_session_private_size_t sym_session_get_size;
        /**< Return private session. */