drivers: rename register macro prefix

[dpdk.git] / drivers / crypto / kasumi / rte_kasumi_pmd.c

diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c
index 1d5af46..11bbf80 100644 (file)
--- a/drivers/crypto/kasumi/rte_kasumi_pmd.c
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c
@@ -35,7 +35,7 @@
 #include <rte_hexdump.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
-#include <rte_dev.h>
+#include <rte_vdev.h>
 #include <rte_malloc.h>
 #include <rte_cpuflags.h>
 
@@ -61,7 +61,7 @@ create_unique_device_name(char *name, size_t size)
        if (name == NULL)
                return -EINVAL;
 
-       ret = snprintf(name, size, "%s_%u", CRYPTODEV_NAME_KASUMI_PMD,
+       ret = snprintf(name, size, "%s_%u", RTE_STR(CRYPTODEV_NAME_KASUMI_PMD),
                        unique_name_id++);
        if (ret < 0)
                return ret;
@@ -108,7 +108,7 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
 {
        const struct rte_crypto_sym_xform *auth_xform = NULL;
        const struct rte_crypto_sym_xform *cipher_xform = NULL;
-       int mode;
+       enum kasumi_operation mode;
 
        /* Select Crypto operation - hash then cipher / cipher then hash */
        mode = kasumi_get_mode(xform);
@@ -125,9 +125,9 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
                /* Fall-through */
        case KASUMI_OP_ONLY_AUTH:
                auth_xform = xform;
-       }
-
-       if (mode == KASUMI_OP_NOT_SUPPORTED) {
+               break;
+       case KASUMI_OP_NOT_SUPPORTED:
+       default:
                KASUMI_LOG_ERR("Unsupported operation chain order parameter");
                return -EINVAL;
        }
@@ -243,9 +243,12 @@ process_kasumi_cipher_op_bit(struct rte_crypto_op *op,
 
        offset_in_bits = op->sym->cipher.data.offset;
        src = rte_pktmbuf_mtod(op->sym->m_src, uint8_t *);
-       dst = op->sym->m_dst ?
-               rte_pktmbuf_mtod(op->sym->m_dst, uint8_t *) :
-               rte_pktmbuf_mtod(op->sym->m_src, uint8_t *);
+       if (op->sym->m_dst == NULL) {
+               op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+               KASUMI_LOG_ERR("bit-level in-place not supported\n");
+               return 0;
+       }
+       dst = rte_pktmbuf_mtod(op->sym->m_dst, uint8_t *);
        IV = *((uint64_t *)(op->sym->cipher.iv.data));
        length_in_bits = op->sym->cipher.data.length;
 
@@ -553,7 +556,7 @@ kasumi_pmd_dequeue_burst(void *queue_pair,
        return nb_dequeued;
 }
 
-static int cryptodev_kasumi_uninit(const char *name);
+static int cryptodev_kasumi_remove(const char *name);
 
 static int
 cryptodev_kasumi_create(const char *name,
@@ -608,12 +611,12 @@ cryptodev_kasumi_create(const char *name,
 init_error:
        KASUMI_LOG_ERR("driver %s: cryptodev_kasumi_create failed", name);
 
-       cryptodev_kasumi_uninit(crypto_dev_name);
+       cryptodev_kasumi_remove(crypto_dev_name);
        return -EFAULT;
 }
 
 static int
-cryptodev_kasumi_init(const char *name,
+cryptodev_kasumi_probe(const char *name,
                const char *input_args)
 {
        struct rte_crypto_vdev_init_params init_params = {
@@ -635,7 +638,7 @@ cryptodev_kasumi_init(const char *name,
 }
 
 static int
-cryptodev_kasumi_uninit(const char *name)
+cryptodev_kasumi_remove(const char *name)
 {
        if (name == NULL)
                return -EINVAL;
@@ -647,13 +650,13 @@ cryptodev_kasumi_uninit(const char *name)
        return 0;
 }
 
-static struct rte_driver cryptodev_kasumi_pmd_drv = {
-       .name = CRYPTODEV_NAME_KASUMI_PMD,
-       .type = PMD_VDEV,
-       .init = cryptodev_kasumi_init,
-       .uninit = cryptodev_kasumi_uninit
+static struct rte_vdev_driver cryptodev_kasumi_pmd_drv = {
+       .probe = cryptodev_kasumi_probe,
+       .remove = cryptodev_kasumi_remove
 };
 
-PMD_REGISTER_DRIVER(cryptodev_kasumi_pmd_drv, kasumi);
-DRIVER_REGISTER_PARAM_STRING(kasumi, "max_nb_queue_pairs=<int> "
-"max_nb_sessions=<int> socket_id=<int>");
+RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_KASUMI_PMD, cryptodev_kasumi_pmd_drv);
+RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_KASUMI_PMD,
+       "max_nb_queue_pairs=<int> "
+       "max_nb_sessions=<int> "
+       "socket_id=<int>");