Merge branch 'pdx86/platform-drivers-x86-mellanox-init' into review-ilpo

diff --cc drivers/platform/x86/mlx-platform.c
index 03ccadee35d02eaf776bb6bb8868c74ae26f4f10,1bad4c64f36cb83634d8e0250b707a79cb57c9bd..32981e2ad3b390217bca086980e1f19097dc6596
--- 1/drivers/platform/x86/mlx-platform.c
--- 2/drivers/platform/x86/mlx-platform.c
+++ b/drivers/platform/x86/mlx-platform.c
@@@ -6614,9 -6616,9 +6616,8 @@@ static void mlxplat_remove(struct platf
                pm_power_off = NULL;
        if (mlxplat_reboot_nb)
                unregister_reboot_notifier(mlxplat_reboot_nb);
-       mlxplat_pre_exit(priv);
        mlxplat_i2c_main_exit(priv);
-       mlxplat_post_exit();
+       mlxplat_logicdev_exit();
 -      return 0;
  }
  
  static const struct acpi_device_id mlxplat_acpi_table[] = {