]> git.droids-corp.org - dpdk.git/commitdiff
cryptodev: remove unused operation for queue count
authorArtur Trybula <arturx.trybula@intel.com>
Fri, 6 Mar 2020 11:16:33 +0000 (12:16 +0100)
committerAkhil Goyal <akhil.goyal@oss.nxp.com>
Sun, 5 Apr 2020 16:26:04 +0000 (18:26 +0200)
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>
20 files changed:
drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
drivers/crypto/armv8/rte_armv8_pmd_ops.c
drivers/crypto/caam_jr/caam_jr.c
drivers/crypto/ccp/ccp_pmd_ops.c
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
drivers/crypto/dpaa_sec/dpaa_sec.c
drivers/crypto/kasumi/rte_kasumi_pmd_ops.c
drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
drivers/crypto/null/null_crypto_pmd_ops.c
drivers/crypto/octeontx/otx_cryptodev_ops.c
drivers/crypto/octeontx2/otx2_cryptodev_ops.c
drivers/crypto/openssl/rte_openssl_pmd_ops.c
drivers/crypto/qat/qat_asym_pmd.c
drivers/crypto/qat/qat_sym_pmd.c
drivers/crypto/scheduler/scheduler_pmd_ops.c
drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
drivers/crypto/virtio/virtio_cryptodev.c
drivers/crypto/zuc/rte_zuc_pmd_ops.c
lib/librte_cryptodev/rte_cryptodev_pmd.h

index c5e0878f556e02c89f13dea5baeeb495be23d0b3..18dbc4c18c3fc108a5394f344bce5867770a49ce 100644 (file)
@@ -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,
 
index d8609ad114288ecc8f48aae6d490007bbe445f0b..8456611743e2a9722e5c8d245b1d75bef160a3e8 100644 (file)
@@ -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,
index 4fd384d1a38e2b944f7a1c34d31ef631ca03e09f..01ccfb4b2366eeb20eca2fc0df4ca11114503047 100644 (file)
@@ -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,
index 8aaa3d45f6b11b9663b57b30d390a46dfecbf948..5a29dd169d48c2371fc2e304239366c0caf62b39 100644 (file)
@@ -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
index a19e85ecb72ff51e0c357785f45c2c935bc89bed..98f964f36199e62c6f0c9b873cf7949058b36417 100644 (file)
@@ -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,
index 6ed2701ab61488c63095111c7fa9d4e2049b67a4..241ec88575156d6b9b1ebf83964f7ab7f91443f9 100644 (file)
@@ -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,
index df684d2654776a99bb2a466357c0eb39f14f05ea..a11b17bda7b4433a30848f6e915c3bb5cc1fd6d2 100644 (file)
@@ -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
index 55fbe00b74a6378fde1ed8bccc3c0e23112aa264..43376c1aa05e76d31f49c763bdf1e3ef6f25dd22 100644 (file)
@@ -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,
index 2dfaa0b1138484e1910d48fb7462ca5c375f28ea..c61bdca369fa0f20db4bff9ba4f35344d7a1ae0a 100644 (file)
@@ -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,
index d988bfe96ac3c8eb8dc99a36739970c88e30701c..d67892a1bbcb8094411fae4fb781d6f44e367a27 100644 (file)
@@ -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,
index d7f3d082720f2945e6dc0e51cda084a141c78e12..51520e75355c818d8da0f69754b041df88dd2613 100644 (file)
@@ -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,
index 7eebb4963618cbceeccdac74bbc0d07a50127a67..a8305f41f4253f2afb0921ab9de7f132853cd1ac 100644 (file)
@@ -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,
index cbfb8149f93faedc05f16d78f720748fd20becd7..ed7587758146afe0388a99bd4597f225a9d9d813 100644 (file)
@@ -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,
index cdf10de511b5624f3ce52f083e1addb5af7f1478..af3cc25f77b492c9534f367c0d4f2af87ba51dd4 100644 (file)
@@ -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,
index 666ede726547a39047058653ca8a976e70c1e517..50abdf6f5bd8b28b9ce83acbf57fcccec3689e4e 100644 (file)
@@ -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,
index cf70218b7f75b9eb1d8aac19ae4f61dd61c432b5..14e5a37128bb9b5d2a2e812b6ee5bcf15c6fa776 100644 (file)
@@ -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,
index ea7663749aa48ddfc6968ec42f5c3715a9a1a2f5..906a0fe60b8d04ed8130e256ba2256f0d6ec66a0 100644 (file)
@@ -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,
index 4af479f54416094eed2ed762ef155a8ac24ffb5d..e7fb71a64c6646a70edfab38c00b8e33fb24609a 100644 (file)
@@ -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,
index ddd0f9243d03079cc2df00ef95fa944a691648e3..dc9dc25ef88e1ae4d42a68def604075b36f0a8aa 100644 (file)
@@ -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,
index 0e6b5f44303e51e6a52a356c2f1913a19873eb69..81975d72b47af1b3d016e87bb34422fc46135885 100644 (file)
@@ -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. */