Use macro consistently for all logs and rte_log_dp() for datapath. Signed-off-by: Stephen Hemminger <step...@networkplumber.org> --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 6 +++--- drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h | 4 ++-- drivers/crypto/dpaa_sec/dpaa_sec.c | 4 ++-- drivers/crypto/dpaa_sec/dpaa_sec_log.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index bb5a2c629e53..1cae6c45059e 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -4153,7 +4153,7 @@ dpaa2_sec_eventq_attach(const struct rte_cryptodev *dev, ret = dpseci_set_opr(dpseci, CMD_PRI_LOW, priv->token, qp_id, OPR_OPT_CREATE, &ocfg); if (ret) { - RTE_LOG(ERR, PMD, "Error setting opr: ret: %d\n", ret); + DPAA2_SEC_ERR("Error setting opr: ret: %d", ret); return ret; } qp->tx_vq.cb_eqresp_free = dpaa2_sec_free_eqresp_buf; @@ -4163,7 +4163,7 @@ dpaa2_sec_eventq_attach(const struct rte_cryptodev *dev, ret = dpseci_set_rx_queue(dpseci, CMD_PRI_LOW, priv->token, qp_id, &cfg); if (ret) { - RTE_LOG(ERR, PMD, "Error in dpseci_set_queue: ret: %d\n", ret); + DPAA2_SEC_ERR("Error in dpseci_set_queue: ret: %d", ret); return ret; } @@ -4188,7 +4188,7 @@ dpaa2_sec_eventq_detach(const struct rte_cryptodev *dev, ret = dpseci_set_rx_queue(dpseci, CMD_PRI_LOW, priv->token, qp_id, &cfg); if (ret) - RTE_LOG(ERR, PMD, "Error in dpseci_set_queue: ret: %d\n", ret); + DPAA2_SEC_ERR("Error in dpseci_set_queue: ret: %d", ret); return ret; } diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h index c2e11f9516f9..cd47225f4720 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h @@ -29,7 +29,7 @@ extern int dpaa2_logtype_sec; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA2_SEC_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + rte_log_dp(RTE_LOG_ ## level, dpaa2_logtype_sec, fmt, ## args) #define DPAA2_SEC_DP_DEBUG(fmt, args...) \ DPAA2_SEC_DP_LOG(DEBUG, fmt, ## args) @@ -38,7 +38,7 @@ extern int dpaa2_logtype_sec; #define DPAA2_SEC_DP_WARN(fmt, args...) \ DPAA2_SEC_DP_LOG(WARNING, fmt, ## args) #define DPAA2_SEC_DP_ERR(fmt, args...) \ - DPAA2_SEC_DP_LOG(ERR, fmt, ## args) + DPAA2_SEC_DP_LOG(ERR, fmt, ## args) #endif /* _DPAA2_SEC_LOGS_H_ */ diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index a301e8edb2a4..3008ca4dc2f7 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -3518,7 +3518,7 @@ dpaa_sec_eventq_detach(const struct rte_cryptodev *dev, qman_oos_fq(&qp->outq); ret = qman_init_fq(&qp->outq, 0, &opts); if (ret) - RTE_LOG(ERR, PMD, "Error in qman_init_fq: ret: %d\n", ret); + DPAA_SEC_ERR("Error in qman_init_fq: ret: %d\n", ret); qp->outq.cb.dqrr = NULL; return ret; @@ -3709,7 +3709,7 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev) dpaa_sec_get_devargs(cryptodev->device->devargs, DRIVER_DUMP_MODE); - RTE_LOG(INFO, PMD, "%s cryptodev init\n", cryptodev->data->name); + DPAA_SEC_INFO("%s cryptodev init\n", cryptodev->data->name); return 0; init_error: diff --git a/drivers/crypto/dpaa_sec/dpaa_sec_log.h b/drivers/crypto/dpaa_sec/dpaa_sec_log.h index fb895a8bc67f..936a61c2c18f 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec_log.h +++ b/drivers/crypto/dpaa_sec/dpaa_sec_log.h @@ -29,7 +29,7 @@ extern int dpaa_logtype_sec; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA_SEC_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + rte_log_dp(RTE_LOG_ ## level, dpaa_logtype_sec, fmt, ## args) #define DPAA_SEC_DP_DEBUG(fmt, args...) \ DPAA_SEC_DP_LOG(DEBUG, fmt, ## args) -- 2.43.0