From: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Date: Fri, 6 Oct 2023 14:51:21 +0000 (+0300)
Subject: Merge branch 'pdx86/platform-drivers-x86-mellanox-init' into review-ilpo
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=378f2b618fedc9e2f57755438e8f080fde3ccc90;p=linux.git

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

378f2b618fedc9e2f57755438e8f080fde3ccc90
diff --cc drivers/platform/x86/mlx-platform.c
index 03ccadee35d02,1bad4c64f36cb..32981e2ad3b39
--- a/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[] = {