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: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20210623022824.308041-3-mcgrof@kernel.org
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index f6729baa1bf45087eae2afd2dba63ae65de30910..759dfb118712d77d1ecb6156db35891fdf5dd874 100644 (file)
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -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 (!__pci_reset_function_locked(pdev))
-                               vdev->needs_reset = false;
-                       device_unlock(&pdev->dev);
-               }
-               pci_cfg_access_unlock(pdev);
+       if (vdev->reset_works && pci_dev_trylock(pdev)) {
+               if (!__pci_reset_function_locked(pdev))
+                       vdev->needs_reset = false;
+               pci_dev_unlock(pdev);
        }
 
        pci_restore_state(pdev);