Commit 742b4c0d authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Alex Williamson
Browse files

vfio: use the new pci_dev_trylock() helper to simplify try lock 



Use the new pci_dev_trylock() helper to simplify our locking.

Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20210623022824.308041-3-mcgrof@kernel.org


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent e3a9b121

drivers/vfio/pci/vfio_pci.c

+4 −7
Original line number Diff line number Diff line
@@ -477,13 +477,10 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev) 
	 * We can not use the "try" reset interface here, which will

	 * overwrite the previously restored configuration information.

	 */

	if (vdev->reset_works && pci_cfg_access_trylock(pdev)) {

		if (device_trylock(&pdev->dev)) {

	if (vdev->reset_works && pci_dev_trylock(pdev)) {

		if (!__pci_reset_function_locked(pdev))

			vdev->needs_reset = false;

			device_unlock(&pdev->dev);

		}

		pci_cfg_access_unlock(pdev);

		pci_dev_unlock(pdev);

	}



	pci_restore_state(pdev);