Commit d76f9633 authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Heiko Carstens
Browse files

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: a46044a9 ("s390/pci: fix zpci_zdev_put() on reserve")
Reviewed-by: default avatarGerd Bayer <gbayer@linux.ibm.com>
Reviewed-by: default avatarJulian Ruess <julianr@linux.ibm.com>
Tested-by: default avatarGerd Bayer <gbayer@linux.ibm.com>
Signed-off-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent b5185ea1

arch/s390/pci/pci.c

+0 −6
Original line number Diff line number Diff line
@@ -949,12 +949,6 @@ void zpci_release_device(struct kref *kref) 


	WARN_ON(zdev->state != ZPCI_FN_STATE_RESERVED);



	if (zdev->zbus->bus)

		zpci_bus_remove_device(zdev, false);



	if (zdev_enabled(zdev))

		zpci_disable_device(zdev);



	if (zdev->has_hp_slot)

		zpci_exit_slot(zdev);