New upstream version 18.08

[deb_dpdk.git] / drivers / crypto / scheduler / scheduler_pmd_private.h

diff --git a/drivers/crypto/scheduler/scheduler_pmd_private.h b/drivers/crypto/scheduler/scheduler_pmd_private.h
index dd7ca5a..d5e602a 100644 (file)
--- a/drivers/crypto/scheduler/scheduler_pmd_private.h
+++ b/drivers/crypto/scheduler/scheduler_pmd_private.h
@@ -12,25 +12,11 @@
 
 #define PER_SLAVE_BUFF_SIZE                    (256)
 
-#define CS_LOG_ERR(fmt, args...)                                       \
-       RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",         \
-               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD),                  \
-               __func__, __LINE__, ## args)
-
-#ifdef RTE_LIBRTE_CRYPTO_SCHEDULER_DEBUG
-#define CS_LOG_INFO(fmt, args...)                                      \
-       RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",        \
-               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD),                  \
-               __func__, __LINE__, ## args)
-
-#define CS_LOG_DBG(fmt, args...)                                       \
-       RTE_LOG(DEBUG, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",       \
-               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD),                  \
-               __func__, __LINE__, ## args)
-#else
-#define CS_LOG_INFO(fmt, args...)
-#define CS_LOG_DBG(fmt, args...)
-#endif
+extern int scheduler_logtype_driver;
+
+#define CR_SCHED_LOG(level, fmt, args...) \
+       rte_log(RTE_LOG_ ## level, scheduler_logtype_driver,            \
+                       "%s() line %u: "fmt "\n", __func__, __LINE__, ##args)
 
 struct scheduler_slave {
        uint8_t dev_id;
@@ -60,7 +46,7 @@ struct scheduler_ctx {
 
        char name[RTE_CRYPTODEV_SCHEDULER_NAME_MAX_LEN];
        char description[RTE_CRYPTODEV_SCHEDULER_DESC_MAX_LEN];
-       uint16_t wc_pool[RTE_CRYPTODEV_SCHEDULER_MAX_NB_WORKER_CORES];
+       uint16_t wc_pool[RTE_MAX_LCORE];
        uint16_t nb_wc;
 
        char *init_slave_names[RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES];