Skip to content

Commit d76f963

Browse files
niklas88hcahca
authored andcommitted
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: [email protected] Fixes: a46044a ("s390/pci: fix zpci_zdev_put() on reserve") Reviewed-by: Gerd Bayer <[email protected]> Reviewed-by: Julian Ruess <[email protected]> Tested-by: Gerd Bayer <[email protected]> Signed-off-by: Niklas Schnelle <[email protected]> Signed-off-by: Heiko Carstens <[email protected]>
1 parent b5185ea commit d76f963

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
@@ -949,12 +949,6 @@ void zpci_release_device(struct kref *kref)
949949

950950
WARN_ON(zdev->state != ZPCI_FN_STATE_RESERVED);
951951

952-
if (zdev->zbus->bus)
953-
zpci_bus_remove_device(zdev, false);
954-
955-
if (zdev_enabled(zdev))
956-
zpci_disable_device(zdev);
957-
958952
if (zdev->has_hp_slot)
959953
zpci_exit_slot(zdev);
960954

0 commit comments

Comments
 (0)