From: Gerd Bayer Date: Fri, 10 Nov 2023 11:06:42 +0000 (+0100) Subject: s390/pci: remove hotplug slot when releasing the device X-Git-Tag: v6.9-rc1~180^2~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ee600bfbe0f;p=thirdparty%2Flinux.git s390/pci: remove hotplug slot when releasing the device Centralize the removal so all paths are covered and the hotplug slot will remain active until the device is really destroyed. Signed-off-by: Gerd Bayer Reviewed-by: Niklas Schnelle Signed-off-by: Heiko Carstens --- diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 17267f659d223..c87b8aff5285b 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -906,8 +906,6 @@ int zpci_deconfigure_device(struct zpci_dev *zdev) */ void zpci_device_reserved(struct zpci_dev *zdev) { - if (zdev->has_hp_slot) - zpci_exit_slot(zdev); /* * Remove device from zpci_list as it is going away. This also * makes sure we ignore subsequent zPCI events for this device. @@ -925,6 +923,9 @@ void zpci_release_device(struct kref *kref) struct zpci_dev *zdev = container_of(kref, struct zpci_dev, kref); int ret; + if (zdev->has_hp_slot) + zpci_exit_slot(zdev); + if (zdev->zbus->bus) zpci_bus_remove_device(zdev, false);