replace panic calls with log and return value. Signed-off-by: Arnon Warshavsky <ar...@qwilt.com> Acked-by: Akhil Goyal <akhil.go...@nxp.com> --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 8 +++++--- drivers/crypto/dpaa_sec/dpaa_sec.c | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 58cbce8..a19fb40 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -2883,9 +2883,11 @@ struct rte_security_ops dpaa2_sec_security_ops = { RTE_CACHE_LINE_SIZE, rte_socket_id()); - if (cryptodev->data->dev_private == NULL) - rte_panic("Cannot allocate memzone for private " - "device data"); + if (cryptodev->data->dev_private == NULL) { + DPAA2_SEC_ERR("%s() Cannot allocate memzone for private device data", + __func__); + return -ENOMEM; + } } dpaa2_dev->cryptodev = cryptodev; diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index e456fd5..a4670bf 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -2352,7 +2352,7 @@ struct rte_security_ops dpaa_sec_security_ops = { } } - 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: @@ -2384,9 +2384,11 @@ struct rte_security_ops dpaa_sec_security_ops = { RTE_CACHE_LINE_SIZE, rte_socket_id()); - if (cryptodev->data->dev_private == NULL) - rte_panic("Cannot allocate memzone for private " - "device data"); + if (cryptodev->data->dev_private == NULL) { + DPAA_SEC_ERR("%s() Cannot allocate memzone for private device data", + __func__); + return -ENOMEM; + } } dpaa_dev->crypto_dev = cryptodev; -- 1.8.3.1