Skip to content

Commit f255bbb

Browse files
author
Mete Durlu
committed
s390/pci: Remove redundant bus removal and disable from zpci_release_device()
JIRA: https://issues.redhat.com/browse/RHEL-94944 commit d76f963 Author: Niklas Schnelle <schnelle@linux.ibm.com> Date: Thu May 22 14:13:12 2025 +0200 s390/pci: Remove redundant bus removal and disable from zpci_release_device() Remove zpci_bus_remove_device() and zpci_disable_device() calls from zpci_release_device(). These calls were done when the device transitioned into the ZPCI_FN_STATE_STANDBY state which is guaranteed to happen before it enters the ZPCI_FN_STATE_RESERVED state. When zpci_release_device() is called the device is known to be in the ZPCI_FN_STATE_RESERVED state which is also checked by a WARN_ON(). Cc: stable@vger.kernel.org Fixes: a46044a ("s390/pci: fix zpci_zdev_put() on reserve") Reviewed-by: Gerd Bayer <gbayer@linux.ibm.com> Reviewed-by: Julian Ruess <julianr@linux.ibm.com> Tested-by: Gerd Bayer <gbayer@linux.ibm.com> Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Mete Durlu <mdurlu@redhat.com>
1 parent 7d88244 commit f255bbb

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

arch/s390/pci/pci.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -943,12 +943,6 @@ void zpci_release_device(struct kref *kref)
943943

944944
WARN_ON(zdev->state != ZPCI_FN_STATE_RESERVED);
945945

946-
if (zdev->zbus->bus)
947-
zpci_bus_remove_device(zdev, false);
948-
949-
if (zdev_enabled(zdev))
950-
zpci_disable_device(zdev);
951-
952946
if (zdev->has_hp_slot)
953947
zpci_exit_slot(zdev);
954948

0 commit comments

Comments
 (0)