[PATCH mlx5-next 04/11] net/mlx5: Make load_one() and unload_one() symmetric

[Saeed Mahameed]

From: Parav Pandit <pa...@mellanox.com>

Currently mlx5_load_one() perform device registration using
mlx5_register_device(). But mlx5_unload_one() doesn't unregister.

Make them symmetric by doing device unregistration in
mlx5_unload_one().

Signed-off-by: Parav Pandit <pa...@mellanox.com>
Signed-off-by: Saeed Mahameed <sae...@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c 
b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index b15b27a497fc..fa0e991f1983 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -1217,8 +1217,10 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, 
bool cleanup)
 {
        int err = 0;
 
-       if (cleanup)
+       if (cleanup) {
+               mlx5_unregister_device(dev);
                mlx5_drain_health_wq(dev);
+       }
 
        mutex_lock(&dev->intf_state_mutex);
        if (!test_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state)) {
@@ -1369,7 +1371,6 @@ static void remove_one(struct pci_dev *pdev)
 
        mlx5_crdump_disable(dev);
        mlx5_devlink_unregister(devlink);
-       mlx5_unregister_device(dev);
 
        if (mlx5_unload_one(dev, true)) {
                mlx5_core_err(dev, "mlx5_unload_one failed\n");
-- 
2.21.0