vdev: use generic vdev struct for probe and remove

[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 a1ec653..42fdd33 100644 (file)
--- a/drivers/crypto/kasumi/rte_kasumi_pmd.c
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c
@@ -116,7 +116,7 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
                if (cipher_xform->cipher.algo != RTE_CRYPTO_CIPHER_KASUMI_F8)
                        return -EINVAL;
                /* Initialize key */
-               sso_kasumi_init_f8_key_sched(xform->cipher.key.data,
+               sso_kasumi_init_f8_key_sched(cipher_xform->cipher.key.data,
                                &sess->pKeySched_cipher);
        }
 
@@ -126,7 +126,7 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
                        return -EINVAL;
                sess->auth_op = auth_xform->auth.op;
                /* Initialize key */
-               sso_kasumi_init_f9_key_sched(xform->auth.key.data,
+               sso_kasumi_init_f9_key_sched(auth_xform->auth.key.data,
                                &sess->pKeySched_hash);
        }
 
@@ -359,7 +359,7 @@ process_ops(struct rte_crypto_op **ops, struct kasumi_session *session,
        }
 
        enqueued_ops = rte_ring_enqueue_burst(qp->processed_ops,
-                               (void **)ops, processed_ops);
+                               (void **)ops, processed_ops, NULL);
        qp->qp_stats.enqueued_count += enqueued_ops;
        *accumulated_enqueued_ops += enqueued_ops;
 
@@ -410,7 +410,7 @@ process_op_bit(struct rte_crypto_op *op, struct kasumi_session *session,
        }
 
        enqueued_op = rte_ring_enqueue_burst(qp->processed_ops, (void **)&op,
-                               processed_op);
+                               processed_op, NULL);
        qp->qp_stats.enqueued_count += enqueued_op;
        *accumulated_enqueued_ops += enqueued_op;
 
@@ -542,16 +542,17 @@ kasumi_pmd_dequeue_burst(void *queue_pair,
        unsigned nb_dequeued;
 
        nb_dequeued = rte_ring_dequeue_burst(qp->processed_ops,
-                       (void **)c_ops, nb_ops);
+                       (void **)c_ops, nb_ops, NULL);
        qp->qp_stats.dequeued_count += nb_dequeued;
 
        return nb_dequeued;
 }
 
-static int cryptodev_kasumi_remove(const char *name);
+static int cryptodev_kasumi_remove(struct rte_vdev_device *vdev);
 
 static int
-cryptodev_kasumi_create(struct rte_crypto_vdev_init_params *init_params)
+cryptodev_kasumi_create(struct rte_vdev_device *vdev,
+                       struct rte_crypto_vdev_init_params *init_params)
 {
        struct rte_cryptodev *dev;
        struct kasumi_private *internals;
@@ -606,13 +607,12 @@ init_error:
        KASUMI_LOG_ERR("driver %s: cryptodev_kasumi_create failed",
                        init_params->name);
 
-       cryptodev_kasumi_remove(init_params->name);
+       cryptodev_kasumi_remove(vdev);
        return -EFAULT;
 }
 
 static int
-cryptodev_kasumi_probe(const char *name,
-               const char *input_args)
+cryptodev_kasumi_probe(struct rte_vdev_device *vdev)
 {
        struct rte_crypto_vdev_init_params init_params = {
                RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_QUEUE_PAIRS,
@@ -620,6 +620,11 @@ cryptodev_kasumi_probe(const char *name,
                rte_socket_id(),
                {0}
        };
+       const char *name;
+       const char *input_args;
+
+       name = rte_vdev_device_name(vdev);
+       input_args = rte_vdev_device_args(vdev);
 
        rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
 
@@ -633,12 +638,15 @@ cryptodev_kasumi_probe(const char *name,
        RTE_LOG(INFO, PMD, "  Max number of sessions = %d\n",
                        init_params.max_nb_sessions);
 
-       return cryptodev_kasumi_create(&init_params);
+       return cryptodev_kasumi_create(vdev, &init_params);
 }
 
 static int
-cryptodev_kasumi_remove(const char *name)
+cryptodev_kasumi_remove(struct rte_vdev_device *vdev)
 {
+       const char *name;
+
+       name = rte_vdev_device_name(vdev);
        if (name == NULL)
                return -EINVAL;