From: Jie Liu <[email protected]> Move sxe2_eth_init() to be called before sxe2_sw_init() and rearrange the error cleanup labels so that resources are torn down in the reverse order of initialization.
Cc: [email protected] Signed-off-by: Jie Liu <[email protected]> --- drivers/net/sxe2/sxe2_ethdev.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/sxe2/sxe2_ethdev.c b/drivers/net/sxe2/sxe2_ethdev.c index 1ffaf9cb9f..72aae84ae3 100644 --- a/drivers/net/sxe2/sxe2_ethdev.c +++ b/drivers/net/sxe2/sxe2_ethdev.c @@ -1946,6 +1946,12 @@ static int32_t sxe2_dev_init(struct rte_eth_dev *dev, goto init_switchdev_err; } + ret = sxe2_eth_init(dev); + if (ret) { + PMD_LOG_ERR(INIT, "Failed to initialize eth parameters, ret=%d", ret); + goto init_eth_err; + } + ret = sxe2_sw_init(dev); if (ret) { PMD_LOG_ERR(INIT, "Failed to initialize sw parameters, ret=[%d]", ret); @@ -1958,12 +1964,6 @@ static int32_t sxe2_dev_init(struct rte_eth_dev *dev, goto init_irq_err; } - ret = sxe2_eth_init(dev); - if (ret) { - PMD_LOG_ERR(INIT, "Failed to initialize eth parameters, ret=%d", ret); - goto init_eth_err; - } - ret = sxe2_security_init(dev); if (ret) { PMD_LOG_ERR(INIT, "Failed to initialize security, ret=%d", ret); @@ -2018,12 +2018,12 @@ static int32_t sxe2_dev_init(struct rte_eth_dev *dev, init_rss_err: sxe2_security_uinit(dev); init_security_err: - sxe2_eth_uinit(dev); -init_eth_err: sxe2_intr_uninit(dev); init_irq_err: sxe2_sw_uninit(dev); init_sw_err: + sxe2_eth_uinit(dev); +init_eth_err: (void)sxe2_switchdev_uninit(dev); init_switchdev_err: init_dev_info_err: -- 2.52.0
