Drop pci-pwrctrl-move-pci_pwrctrl_unregister-to-pci_destr.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.14/pci-pwrctrl-move-pci_pwrctrl_unregister-to-pci_destr.patch b/queue-6.14/pci-pwrctrl-move-pci_pwrctrl_unregister-to-pci_destr.patch
deleted file mode 100644 (file)
index bce404c..0000000
--- a/queue-6.14/pci-pwrctrl-move-pci_pwrctrl_unregister-to-pci_destr.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8dbfe01e42616bb68faef98252c74b2ad2f200f5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 16 Jan 2025 19:39:12 +0530
-Subject: PCI/pwrctrl: Move pci_pwrctrl_unregister() to pci_destroy_dev()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 2d923930f2e3fe1ecf060169f57980da819a191f ]
-
-The PCI core will try to access the devices even after pci_stop_dev()
-for things like Data Object Exchange (DOE), ASPM, etc.
-
-So, move pci_pwrctrl_unregister() to the near end of pci_destroy_dev()
-to make sure that the devices are powered down only after the PCI core
-is done with them.
-
-Suggested-by: Lukas Wunner <lukas@wunner.de>
-Reviewed-by: Lukas Wunner <lukas@wunner.de>
-Tested-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20250116-pci-pwrctrl-slot-v3-2-827473c8fbf4@linaro.org
-[kwilczynski: commit log]
-Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pci/remove.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
-index efc37fcb73e24..58859f9d92f73 100644
---- a/drivers/pci/remove.c
-+++ b/drivers/pci/remove.c
-@@ -41,7 +41,6 @@ static void pci_stop_dev(struct pci_dev *dev)
-       if (!pci_dev_test_and_clear_added(dev))
-               return;
- 
--      pci_pwrctrl_unregister(&dev->dev);
-       device_release_driver(&dev->dev);
-       pci_proc_detach_device(dev);
-       pci_remove_sysfs_dev_files(dev);
-@@ -64,6 +63,7 @@ static void pci_destroy_dev(struct pci_dev *dev)
-       pci_doe_destroy(dev);
-       pcie_aspm_exit_link_state(dev);
-       pci_bridge_d3_update(dev);
-+      pci_pwrctrl_unregister(&dev->dev);
-       pci_free_resources(dev);
-       put_device(&dev->dev);
- }
--- 
-2.39.5
-

diff --git a/queue-6.14/series b/queue-6.14/series
index 66fa7f43fb1289732764d2a1824dda0d5d494b97..4829871c63d49f9b85263d70115f872315e7b8a6 100644 (file)
--- a/queue-6.14/series
+++ b/queue-6.14/series
@@ -417,7 +417,6 @@ mfd-axp20x-axp717-add-axp717_ts_pin_cfg-to-writeable.patch
 eeprom-ee1004-check-chip-before-probing.patch
 irqchip-riscv-imsic-separate-next-and-previous-point.patch
 drm-xe-client-skip-show_run_ticks-if-unable-to-read-.patch
-pci-pwrctrl-move-pci_pwrctrl_unregister-to-pci_destr.patch
 drm-amd-pm-fetch-current-power-limit-from-pmfw.patch
 drm-amd-display-add-support-for-disconnected-edp-str.patch
 drm-amd-display-guard-against-setting-dispclk-low-wh.patch