New upstream version 18.11-rc1

[deb_dpdk.git] / lib / librte_cryptodev / rte_cryptodev_pmd.c

diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.c b/lib/librte_cryptodev/rte_cryptodev_pmd.c
index b4eeb44..f03bdbd 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev_pmd.c
+++ b/lib/librte_cryptodev/rte_cryptodev_pmd.c
@@ -1,33 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2017 Intel Corporation. All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of the copyright holder nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Intel Corporation
  */
 
 #include <rte_malloc.h>
@@ -93,13 +65,6 @@ rte_cryptodev_pmd_parse_input_args(
                if (ret < 0)
                        goto free_kvlist;
 
-               ret = rte_kvargs_process(kvlist,
-                               RTE_CRYPTODEV_PMD_MAX_NB_SESS_ARG,
-                               &rte_cryptodev_pmd_parse_uint_arg,
-                               &params->max_nb_sessions);
-               if (ret < 0)
-                       goto free_kvlist;
-
                ret = rte_kvargs_process(kvlist,
                                RTE_CRYPTODEV_PMD_SOCKET_ID_ARG,
                                &rte_cryptodev_pmd_parse_uint_arg,
@@ -128,25 +93,20 @@ rte_cryptodev_pmd_create(const char *name,
        struct rte_cryptodev *cryptodev;
 
        if (params->name[0] != '\0') {
-               CDEV_LOG_INFO("[%s] User specified device name = %s\n",
-                               device->driver->name, params->name);
+               CDEV_LOG_INFO("User specified device name = %s\n", params->name);
                name = params->name;
        }
 
-       CDEV_LOG_INFO("[%s] - Creating cryptodev %s\n",
-                       device->driver->name, name);
+       CDEV_LOG_INFO("Creating cryptodev %s\n", name);
 
-       CDEV_LOG_INFO("[%s] - Initialisation parameters - name: %s,"
-                       "socket id: %d, max queue pairs: %u, max sessions: %u",
-                       device->driver->name, name,
-                       params->socket_id, params->max_nb_queue_pairs,
-                       params->max_nb_sessions);
+       CDEV_LOG_INFO("Initialisation parameters - name: %s,"
+                       "socket id: %d, max queue pairs: %u",
+                       name, params->socket_id, params->max_nb_queue_pairs);
 
        /* allocate device structure */
        cryptodev = rte_cryptodev_pmd_allocate(name, params->socket_id);
        if (cryptodev == NULL) {
-               CDEV_LOG_ERR("[%s] Failed to allocate crypto device for %s",
-                               device->driver->name, name);
+               CDEV_LOG_ERR("Failed to allocate crypto device for %s", name);
                return NULL;
        }
 
@@ -159,9 +119,8 @@ rte_cryptodev_pmd_create(const char *name,
                                                params->socket_id);
 
                if (cryptodev->data->dev_private == NULL) {
-                       CDEV_LOG_ERR("[%s] Cannot allocate memory for "
-                                       "cryptodev %s private data",
-                                       device->driver->name, name);
+                       CDEV_LOG_ERR("Cannot allocate memory for cryptodev %s"
+                                       " private data", name);
 
                        rte_cryptodev_pmd_release_device(cryptodev);
                        return NULL;
@@ -181,9 +140,7 @@ rte_cryptodev_pmd_destroy(struct rte_cryptodev *cryptodev)
 {
        int retval;
 
-       CDEV_LOG_INFO("[%s] Closing crypto device %s",
-                       cryptodev->device->driver->name,
-                       cryptodev->device->name);
+       CDEV_LOG_INFO("Closing crypto device %s", cryptodev->device->name);
 
        /* free crypto device */
        retval = rte_cryptodev_pmd_release_device(cryptodev);