From bbe569daa7e99b36d44b12bb3d23ddfbc26d383c Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Thu, 25 May 2017 08:29:47 +0100 Subject: [PATCH] crypto/scheduler: remove deprecated functions This patch remove the deprecated functions as well as notice for scheduler mode set/get API changes. Signed-off-by: Fan Zhang Acked-by: Pablo de Lara --- doc/guides/rel_notes/deprecation.rst | 6 ---- .../scheduler/rte_cryptodev_scheduler.c | 13 -------- .../scheduler/rte_cryptodev_scheduler.h | 32 ------------------- .../rte_pmd_crypto_scheduler_version.map | 2 -- 4 files changed, 53 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 1786a59dda..1861816342 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -94,12 +94,6 @@ Deprecation Notices and ``rte_crypto_sym_xform`` will be restructured in 17.08, for correctness and improvement. -* crypto/scheduler: the following two functions are deprecated starting - from 17.05 and will be removed in 17.08: - - - ``rte_crpytodev_scheduler_mode_get``, replaced by ``rte_cryptodev_scheduler_mode_get`` - - ``rte_crpytodev_scheduler_mode_set``, replaced by ``rte_cryptodev_scheduler_mode_set`` - * librte_table: The ``key_mask`` parameter will be added to all the hash tables that currently do not have it, as well as to the hash compute function prototype. The non-"do-sig" versions of the hash tables will be removed diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c index 319dcf0a79..95566d5b79 100644 --- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c +++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c @@ -359,13 +359,6 @@ rte_cryptodev_scheduler_mode_set(uint8_t scheduler_id, return 0; } -int -rte_crpytodev_scheduler_mode_set(uint8_t scheduler_id, - enum rte_cryptodev_scheduler_mode mode) -{ - return rte_cryptodev_scheduler_mode_set(scheduler_id, mode); -} - enum rte_cryptodev_scheduler_mode rte_cryptodev_scheduler_mode_get(uint8_t scheduler_id) { @@ -387,12 +380,6 @@ rte_cryptodev_scheduler_mode_get(uint8_t scheduler_id) return sched_ctx->mode; } -enum rte_cryptodev_scheduler_mode -rte_crpytodev_scheduler_mode_get(uint8_t scheduler_id) -{ - return rte_cryptodev_scheduler_mode_get(scheduler_id); -} - int rte_cryptodev_scheduler_ordering_set(uint8_t scheduler_id, uint32_t enable_reorder) diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.h b/drivers/crypto/scheduler/rte_cryptodev_scheduler.h index 2ba6e470e3..33570ec10a 100644 --- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.h +++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.h @@ -185,38 +185,6 @@ rte_cryptodev_scheduler_mode_set(uint8_t scheduler_id, enum rte_cryptodev_scheduler_mode rte_cryptodev_scheduler_mode_get(uint8_t scheduler_id); -/** - * @deprecated - * Set the scheduling mode - * - * @param scheduler_id - * The target scheduler device ID - * @param mode - * The scheduling mode - * - * @return - * 0 if attaching successful, negative integer if otherwise. - */ -__rte_deprecated -int -rte_crpytodev_scheduler_mode_set(uint8_t scheduler_id, - enum rte_cryptodev_scheduler_mode mode); - -/** - * @deprecated - * Get the current scheduling mode - * - * @param scheduler_id - * The target scheduler device ID - * - * @return - * If successful, returns the scheduling mode, negative integer - * otherwise - */ -__rte_deprecated -enum rte_cryptodev_scheduler_mode -rte_crpytodev_scheduler_mode_get(uint8_t scheduler_id); - /** * Set the crypto ops reordering feature on/off * diff --git a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map index 0a8b47160f..5c43127cf2 100644 --- a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map +++ b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map @@ -4,8 +4,6 @@ DPDK_17.02 { rte_cryptodev_scheduler_load_user_scheduler; rte_cryptodev_scheduler_slave_attach; rte_cryptodev_scheduler_slave_detach; - rte_crpytodev_scheduler_mode_set; - rte_crpytodev_scheduler_mode_get; rte_cryptodev_scheduler_ordering_set; rte_cryptodev_scheduler_ordering_get; -- 2.20.1